diff --git a/tools/test-all b/tools/test-all
index a8372ada09..b305b42dbe 100755
--- a/tools/test-all
+++ b/tools/test-all
@@ -30,22 +30,30 @@ function run {
     fi
 }
 
+# prep
 run ./tools/check-provision $FORCEARG
 run ./tools/clean-repo
-run ./tools/test-tools
-run ./tools/lint --pep8 $FORCEARG
-run ./tools/test-migrations
-run ./tools/test-js-with-node
+
+# travis/static-analysis
 run ./tools/run-mypy
+
+# travis/backend
+run ./tools/lint --pep8 $FORCEARG
+run ./tools/test-tools
 run ./tools/test-backend $FORCEARG
-run ./tools/test-js-with-casper $FORCEARG
+run ./tools/test-migrations
 # Not running SVG optimizing since it's low-churn
 # run ./tools/optimize-svg
-# Not running queue worker reload tests since it's low-churn code
-# run ./tools/test-queue-worker-reload
 # Not running documentation tests since it takes 20s and only tests documentation
 # run ./tools/test-documentation
 run ./tools/test-help-documentation.py $FORCEARG
 run ./tools/test-api
 
+# Not running queue worker reload tests since it's low-churn code
+# run ./tools/test-queue-worker-reload
+
+# travis/frontend
+run ./tools/test-js-with-node
+run ./tools/test-js-with-casper $FORCEARG
+
 printf '\n\e[32mAll OK!\e[0m\n'
diff --git a/tools/travis/backend b/tools/travis/backend
index 1cc0faa8b6..4692d1787e 100755
--- a/tools/travis/backend
+++ b/tools/travis/backend
@@ -13,14 +13,15 @@ set -x
 ./tools/test-tools
 ./tools/test-backend --coverage
 ./tools/test-migrations
-# test-run-dev temporarily disabled due to weird Travis CI issues.
-#./tools/test-run-dev
 ./tools/optimize-svg
 ./tools/test-documentation
 ./tools/test-help-documentation.py
 ./tools/test-api
+
+# Some test suites disabled in CI for being flaky
+#./tools/test-run-dev
+#./tools/test-queue-worker-reload
+
 python manage.py makemessages --locale en
 python -W ignore tools/check-capitalization --no-generate
 python -W ignore tools/check-frontend-i18n --no-generate
-# Some test suites disabled in CI for being flaky
-#./tools/test-queue-worker-reload