diff --git a/.travis.yml b/.travis.yml
index abcc36e02..e4390bde0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,23 @@ jobs:
     # Stage: Build dependencies
     ###
 
+    # osx
+    - stage: Build dependencies
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultDebug BuildDep
+    - stage: Build dependencies
+      os: osx
+      compiler: clang
+      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
+      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/install_osx.sh
+      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
+        travis/postsubmit.sh DefaultRelease BuildDep
     # ubuntu-16.10
     - stage: Build dependencies
       os: linux
@@ -73,28 +90,28 @@ jobs:
         travis/postsubmit.sh DefaultRelease BuildDep
       before_cache:
         docker cp storm:/storm/. .
+
+    ###
+    # Stage: Build library (1st run)
+    ###
+
     # osx
-    - stage: Build dependencies
+    - stage: Build library (1st run)
       os: osx
       compiler: clang
       env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultDebug BuildDep
-    - stage: Build dependencies
+        travis/postsubmit.sh DefaultDebug BuildLib1
+    - stage: Build library (1st run)
       os: osx
       compiler: clang
       env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultRelease BuildDep
-
-    ###
-    # Stage: Build library (1st run)
-    ###
-
+        travis/postsubmit.sh DefaultRelease BuildLib1
     # ubuntu-16.10
     - stage: Build library (1st run)
       os: linux
@@ -137,28 +154,28 @@ jobs:
         travis/postsubmit.sh DefaultRelease BuildLib1
       before_cache:
         docker cp storm:/storm/. .
+
+    ###
+    # Stage: Build library (2nd run)
+    ###
+
     # osx
-    - stage: Build library (1st run)
+    - stage: Build library (2nd run)
       os: osx
       compiler: clang
       env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultDebug BuildLib1
-    - stage: Build library (1st run)
+        travis/postsubmit.sh DefaultDebug BuildLib
+    - stage: Build library (2nd run)
       os: osx
       compiler: clang
       env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultRelease BuildLib1
-
-    ###
-    # Stage: Build library (2nd run)
-    ###
-
+        travis/postsubmit.sh DefaultRelease BuildLib
     # ubuntu-16.10
     - stage: Build library (2nd run)
       os: linux
@@ -201,28 +218,28 @@ jobs:
         travis/postsubmit.sh DefaultRelease BuildLib
       before_cache:
         docker cp storm:/storm/. .
+
+    ###
+    # Stage: Build all
+    ###
+
     # osx
-    - stage: Build library (2nd run)
+    - stage: Build all
       os: osx
       compiler: clang
       env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultDebug BuildLib
-    - stage: Build library (2nd run)
+        travis/postsubmit.sh DefaultDebug BuildAll
+    - stage: Build all
       os: osx
       compiler: clang
       env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultRelease BuildLib
-
-    ###
-    # Stage: Build all
-    ###
-
+        travis/postsubmit.sh DefaultRelease BuildAll
     # ubuntu-16.10
     - stage: Build all
       os: linux
@@ -265,28 +282,28 @@ jobs:
         travis/postsubmit.sh DefaultRelease BuildAll
       before_cache:
         docker cp storm:/storm/. .
+
+    ###
+    # Stage: Test all
+    ###
+
     # osx
-    - stage: Build all
+    - stage: Test all
       os: osx
       compiler: clang
       env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultDebug BuildAll
-    - stage: Build all
+        travis/postsubmit.sh DefaultDebug TestAll
+    - stage: Test all
       os: osx
       compiler: clang
       env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
       install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultRelease BuildAll
-
-    ###
-    # Stage: Test all
-    ###
-
+        travis/postsubmit.sh DefaultRelease TestAll
     # ubuntu-16.10
     - stage: Test all
       os: linux
@@ -329,21 +346,4 @@ jobs:
         travis/postsubmit.sh DefaultRelease TestAll
       before_cache:
         docker cp storm:/storm/. .
-    # osx
-    - stage: Test all
-      os: osx
-      compiler: clang
-      env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
-      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/install_osx.sh
-      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultDebug TestAll
-    - stage: Test all
-      os: osx
-      compiler: clang
-      env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
-      install: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/install_osx.sh
-      script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
-        travis/postsubmit.sh DefaultRelease TestAll
 
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index 3c2de4b25..1f8bb5f94 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -67,6 +67,23 @@ if __name__ == "__main__":
         s += "    # Stage: {}\n".format(stage[0])
         s += "    ###\n"
         s += "\n"
+        # Mac OS X
+        for config in configs_mac:
+            osx = config[0]
+            compiler = "{}{}".format(config[1], config[2])
+            s += "    # {}\n".format(osx)
+            buildConfig = ""
+            for build in build_types:
+                buildConfig += "    - stage: {}\n".format(stage[0])
+                buildConfig += "      os: osx\n"
+                buildConfig += "      compiler: {}\n".format(config[1])
+                buildConfig += "      env: BUILD={} COMPILER={} STL=libc++\n".format(build, compiler)
+                buildConfig += "      install: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
+                buildConfig += "        travis/install_osx.sh\n"
+                buildConfig += "      script: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
+                buildConfig += "        travis/postsubmit.sh {} {}\n".format(build, stage[1])
+            s += buildConfig
+
         # Linux via Docker
         for config in configs_linux:
             linux = config[0]
@@ -86,21 +103,4 @@ if __name__ == "__main__":
                 buildConfig += "        docker cp storm:/storm/. .\n"
             s += buildConfig
 
-        # Mac OS X
-        for config in configs_mac:
-            osx = config[0]
-            compiler = "{}{}".format(config[1], config[2])
-            s += "    # {}\n".format(osx)
-            buildConfig = ""
-            for build in build_types:
-                buildConfig += "    - stage: {}\n".format(stage[0])
-                buildConfig += "      os: osx\n"
-                buildConfig += "      compiler: {}\n".format(config[1])
-                buildConfig += "      env: BUILD={} COMPILER={} STL=libc++\n".format(build, compiler)
-                buildConfig += "      install: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
-                buildConfig += "        travis/install_osx.sh\n"
-                buildConfig += "      script: export OS=osx; export COMPILER='{}'; export STL='libc++';\n".format(compiler)
-                buildConfig += "        travis/postsubmit.sh {} {}\n".format(build, stage[1])
-            s += buildConfig
-
     print(s)