diff --git a/.travis.yml b/.travis.yml
index e4338e901f..cb2e0887a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,14 +69,16 @@ env:
     # As of 07/2015 this value works best in a Travis CI container.
     - VT_GO_PARALLEL=4
   matrix:
+    # NOTE: Travis CI schedules up to 5 tests simultaneously.
+    #       All our tests should be spread out as evenly as possible across these 5 slots.
+    #       We should always utilize all 5 slots because the cost of the setup is high (up to one minute).
     # NOTE: Use "" if you specify a space separated list of multiple targets.
-    - MAKE_TARGET=java_vtgate_client_test
-    - MAKE_TARGET=unit_test_goveralls
-    - MAKE_TARGET=small_integration_test
-    - MAKE_TARGET=medium_integration_test
-    - MAKE_TARGET=large_integration_test
-    - MAKE_TARGET=queryservice_test
-    - MAKE_TARGET=unit_test
+   - MAKE_TARGET="unit_test build java_vtgate_client_test queryservice_test"
+   - MAKE_TARGET="unit_test_race unit_test_goveralls"
+   # Run large tests first because they take longer than medium. This way, it evens out better when tests get queued.
+   - MAKE_TARGET="build large_integration_test ci_skip_integration_test"
+   - MAKE_TARGET="build small_integration_test"
+   - MAKE_TARGET="build medium_integration_test"
 before_install:
   - bash travis/download_mariadb.sh
   # TODO(mberlin): Remove this when python-mysql is installable via the "apt" addon above.
@@ -106,4 +108,3 @@ after_failure:
   - ls -alR $HOME/gopath/vtdataroot
   # Output *.log* and *.stderr files. (Uncomment VT_TEST_FLAGS above or tests will delete their logs.)
   - find $HOME/gopath/vtdataroot \( -name "*.log*" -or -name "*.stderr" \) -type f -print0 | xargs -0r --verbose --max-args=1 cat
-      
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4c278f92d7..09e2504fd0 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,10 @@ small_integration_test_files = \
 	binlog.py \
 	backup.py \
 	update_stream.py \
-	custom_sharding.py
+	custom_sharding.py \
+	initial_sharding_bytes.py \
+	initial_sharding.py \
+	zkocc_test.py
 
 medium_integration_test_files = \
 	tabletmanager.py \
@@ -119,18 +122,15 @@ medium_integration_test_files = \
 	automation_horizontal_resharding.py
 
 large_integration_test_files = \
-	vtgatev2_test.py \
-	zkocc_test.py
+	vtgatev2_test.py
 
 # The following tests are considered too flaky to be included
 # in the continous integration test suites
 ci_skip_integration_test_files = \
-	initial_sharding_bytes.py \
-	initial_sharding.py \
 	resharding_bytes.py \
 	resharding.py
 
-# Run the following tests after making worker changes
+# Run the following tests after making worker changes.
 worker_integration_test_files = \
 	binlog.py \
 	resharding.py \