diff --git a/.travis.yml b/.travis.yml
index bc82218..14e0934 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ rvm:
 before_script:
   - gem install bundler -v 1.16.2
   - bundle exec hatchet ci:setup
+  - docker build --pull --tag heroku-python-build-heroku-18 --file $(pwd)/Dockerfile.heroku-18 .
 jobs:
   include:
   - stage: Bash linting (shellcheck)
@@ -14,22 +15,19 @@ jobs:
     script: make check
   - stage: Heroku 18 Test
     name: Build Heroku 18
-    script: docker build --pull --tag heroku-python-build-heroku-18 --file $(pwd)/Dockerfile.heroku-18 .
-    name: Test Deps
-    script: docker run --rm heroku-python-build-heroku-18 bash test/run-deps
-    name: Test Python Versions
-    script: docker run --rm heroku-python-build-heroku-18 bash test/run-versions
-    name: Test Feature Steps
-    script: docker run --rm heroku-python-build-heroku-18 bash test/run-features
+    script: docker run --rm heroku-python-build-heroku-18 bash $TESTFOLDER
   - stage: Hatchet Integration
     if: branch = master
     name: Run Hatchet
     script: "bundle exec rspec"
 env:
   global:
-    - HATCHET_RETRIES=3
-    - IS_RUNNING_ON_CI=true
-    - HATCHET_APP_LIMIT=5
-    - HATCHET_DEPLOY_STRATEGY=git
-    - secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
-    - secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=
+    secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
+    secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=
+     - TESTFOLDER=test/run-deps
+     - TESTFOLDER=test/run-versions
+     - TESTFOLDER=test/run-features
+     - HATCHET_RETRIES=3
+     - IS_RUNNING_ON_CI=true
+     - HATCHET_APP_LIMIT=5
+     - HATCHET_DEPLOY_STRATEGY=git