diff --git a/.travis.yml b/.travis.yml
index a072d1287..397db5cfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,38 @@
 language: scala
-script:
-  - sbt "$SCRIPTED_TEST"
-env:
-  - SCRIPTED_TEST="scripted actions/*"
-  - SCRIPTED_TEST="scripted api/*"
-  - SCRIPTED_TEST="scripted compiler-project/*""
-  - SCRIPTED_TEST="scripted dependency-management/*1of2"
-  - SCRIPTED_TEST="scripted dependency-management/*2of2"
-  - SCRIPTED_TEST="scripted java/*"
-  - SCRIPTED_TEST="scripted package/*"
-  - SCRIPTED_TEST="scripted project/*1of2"
-  - SCRIPTED_TEST="scripted project/*2of2"
-  - SCRIPTED_TEST="scripted reporter/*"
-  - SCRIPTED_TEST="scripted run/*"
-  - SCRIPTED_TEST="scripted source-dependencies/*1of3"
-  - SCRIPTED_TEST="scripted source-dependencies/*2of3"
-  - SCRIPTED_TEST="scripted source-dependencies/*3of3"
-  - SCRIPTED_TEST="scripted tests/*"
-  - SCRIPTED_TEST="safeUnitTests"
-  - SCRIPTED_TEST="checkBuildScala211"
+
 # TODO - we'd like to actually test everything, but the process library has a deadlock right now
 jdk:
   - openjdk6
 #  - oraclejdk7
+
+sudo: false
+
+env:
+  global:
+    - JVM_OPTS="-Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m"
+  matrix:
+    - SCRIPTED_TEST="scripted actions/*"
+    - SCRIPTED_TEST="scripted api/*"
+    - SCRIPTED_TEST="scripted compiler-project/*""
+    - SCRIPTED_TEST="scripted dependency-management/*1of2"
+    - SCRIPTED_TEST="scripted dependency-management/*2of2"
+    - SCRIPTED_TEST="scripted java/*"
+    - SCRIPTED_TEST="scripted package/*"
+    - SCRIPTED_TEST="scripted project/*1of2"
+    - SCRIPTED_TEST="scripted project/*2of2"
+    - SCRIPTED_TEST="scripted reporter/*"
+    - SCRIPTED_TEST="scripted run/*"
+    - SCRIPTED_TEST="scripted source-dependencies/*1of3"
+    - SCRIPTED_TEST="scripted source-dependencies/*2of3"
+    - SCRIPTED_TEST="scripted source-dependencies/*3of3"
+    - SCRIPTED_TEST="scripted tests/*"
+    - SCRIPTED_TEST="safeUnitTests"
+    - SCRIPTED_TEST="checkBuildScala211"
+
+script:
+  - sbt "$SCRIPTED_TEST"
+
 notifications:
   email:
     - qbranch@typesafe.com
-before_script:
-  - export JVM_OPTS="-Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m"
\ No newline at end of file
+