diff --git a/.travis.yml b/.travis.yml
index cab8078c..ae1ee7b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,97 +30,97 @@ script:
     bash "${BUILDSCRIPT}" "${BUILDNAME}" "-DUSE_TFM -DTFM_DESC" "makefile.shared V=1" "${BUILDOPTIONS}" "-ltfm"
 env:
   - |
-    BUILDSCRIPT=".ci/meta_builds.sh"
     BUILDNAME="META_BUILDS"
     BUILDOPTIONS="-DGMP_DESC"
+    BUILDSCRIPT=".ci/meta_builds.sh"
   - |
-    BUILDSCRIPT=".ci/valgrind.sh"
     BUILDNAME="VALGRIND"
     BUILDOPTIONS=" "
+    BUILDSCRIPT=".ci/valgrind.sh"
   - |
-    BUILDSCRIPT=".ci/run.sh"
     BUILDNAME="STOCK"
     BUILDOPTIONS=" "
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="STOCK-MPI"
     BUILDOPTIONS="-ULTM_DESC -UTFM_DESC -UUSE_LTM -UUSE_TFM"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="EASY"
     BUILDOPTIONS="-DLTC_EASY"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="SMALL"
     BUILDOPTIONS="-DLTC_SMALL_CODE"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="NOTABLES"
     BUILDOPTIONS="-DLTC_NO_TABLES"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="SMALL+NOTABLES"
     BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_NO_TABLES"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="CLEANSTACK"
     BUILDOPTIONS="-DLTC_CLEAN_STACK"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="CLEANSTACK+SMALL"
     BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_CLEAN_STACK"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="CLEANSTACK+NOTABLES"
     BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="CLEANSTACK+NOTABLES+SMALL"
     BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="NO_FAST"
     BUILDOPTIONS="-DLTC_NO_FAST"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="NO_FAST+NOTABLES"
     BUILDOPTIONS="-DLTC_NO_FAST -DLTC_NO_TABLES"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="NO_ASM"
     BUILDOPTIONS="-DLTC_NO_ASM"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="NO_TIMING_RESISTANCE"
     BUILDOPTIONS="-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
     BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="PTHREAD"
     BUILDOPTIONS="-DLTC_PTHREAD"
-  - |
     BUILDSCRIPT=".ci/run.sh"
-    BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC+PTHREAD"
+  - |
+    BUILDNAME="PTHREAD+CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
     BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC -DLTC_PTHREAD"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="STOCK+ARGTYPE=1"
     BUILDOPTIONS="-DARGTYPE=1"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="STOCK+ARGTYPE=2"
     BUILDOPTIONS="-DARGTYPE=2"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="STOCK+ARGTYPE=3"
     BUILDOPTIONS="-DARGTYPE=3"
-  - |
     BUILDSCRIPT=".ci/run.sh"
+  - |
     BUILDNAME="STOCK+ARGTYPE=4"
     BUILDOPTIONS="-DARGTYPE=4"
+    BUILDSCRIPT=".ci/run.sh"
 
 after_failure:
   - cat test_std.txt