diff --git a/.travis.yml b/.travis.yml
index d102f3d8477..46e74eb6990 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: cpp
-script: ./tools/run_tests/run_tests.py -lc -t -j2
+script:
+  - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg
+  - ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt
 notifications:
   email: false
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index 7e1faa7b949..e40235341c0 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -292,7 +292,7 @@ def run(cmdlines,
   if not travis:
     cmdlines = shuffle_iteratable(cmdlines)
   else:
-    cmdlines = sorted(cmdlines)
+    cmdlines = sorted(cmdlines, key=lambda x: x.shortname)
   for cmdline in cmdlines:
     if not js.start(cmdline):
       break