diff --git a/.travis.yml b/.travis.yml
index bf8c79be9df4520e772acb7e66a5c6c7c496b7fe..7f5f026790a7d36caef33063435bd9e38acaf672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,8 @@ language: bash
 sudo: required
 services:
   - docker
-install: docker pull heroku/cedar:14
-script: make test
+# install: docker pull heroku/cedar:14
+script: ./tests.sh
+env:
+  - STACK=heroku-16
+  - STACK=cedar-14
\ No newline at end of file
diff --git a/tests.sh b/tests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b4a7fedbeda24f0aa1e2f608883412b67e3cdbc5
--- /dev/null
+++ b/tests.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+if [[ ! "$STACK" ]]; then
+    echo '$STACK must be set! (heroku-16 | cedar-14)'
+    exit 1
+fi
+
+if [[ "$STACK" == "cedar-14" ]]; then
+    make test-cedar-14
+    exit $?
+fi
+
+if [[ "$STACK" == "heroku-16" ]]; then
+    make test-heroku-16
+    exit $?
+fi
\ No newline at end of file