diff --git a/.travis.yml b/.travis.yml
index f2e12fee7a2d10d112b3ed1534aa24a7e5fb45e7..ad3e42b521414973612faa89da92af335a4d7635 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,44 @@
-language: bash
+language: ruby
 dist: trusty
+rvm:
+- 2.4.4
+before_script:
+  - gem install bundler -v 1.16.2
+  - bundle exec rake hatchet:setup_travis
+addons:
+  apt:
+    sources:
+    - heroku
+    packages:
+    - heroku-toolbelt
 jobs:
   include:
-    - stage: "Bash linting (shellcheck)"
-      sudo: false
-      before_install:
-        - wget -c https://goo.gl/ZzKHFv -O - | tar -xvJ -C /tmp/
-        - PATH="/tmp/shellcheck-latest:$PATH"
-      script: make check
-
-    - stage: "Stack Tests"
-      services: docker
-      env: STACK=heroku-18
-      script: ./tests.sh
-
-    - stage: "Stack Tests"
-      services: docker
-      env: STACK=heroku-16
-      script: ./tests.sh
-
-    - stage: "Stack Tests"
-      services: docker
-      env: STACK=cedar-14
-      script: ./tests.sh
+  - stage: Bash linting (shellcheck)
+    sudo: false
+    before_install:
+    - wget -c https://goo.gl/ZzKHFv -O - | tar -xvJ -C /tmp/
+    - PATH="/tmp/shellcheck-latest:$PATH"
+    script: make check
+  - stage: Stack Tests
+    services: docker
+    env: STACK=heroku-18
+    script: "./tests.sh"
+  - stage: Stack Tests
+    services: docker
+    env: STACK=heroku-16
+    script: "./tests.sh"
+  - stage: Stack Tests
+    services: docker
+    env: STACK=cedar-14
+    script: "./tests.sh"
+  - stage: Stack Tests
+    services: docker
+    env: STACK=heroku-16
+    script: "rspec"
+env:
+  global:
+    - HATCHET_RETRIES=3
+    - IS_RUNNING_ON_CI=true
+    - HATCHET_APP_LIMIT=5
+  - secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
+  - secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=
diff --git a/hatchet.json b/hatchet.json
index 20ed7dabd8c81ebee2149bef8801ed4f7d186626..cbe7dd44f601788fa3d812427c18b0dd49de4995 100644
--- a/hatchet.json
+++ b/hatchet.json
@@ -1,5 +1,6 @@
 {
   "python": [
     "heroku/python-getting-started"
+    // "pyhatchery/x" <- namespace of python test org
   ]
 }