diff --git a/shippable.yml b/shippable.yml
index a381438f2a2..2775d5549d0 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -2,10 +2,39 @@ language: python
 
 env:
   matrix:
-    - TEST=code-smell INSTALL_DEPS=1
+    - TEST=none
 
 matrix:
+  exclude:
+    - env: TEST=none
   include:
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos6
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos7
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora-rawhide
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora23
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:opensuseleap
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
+    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1604
+
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos6
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos7
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora-rawhide
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora23
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuseleap
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
+    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604
+
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos6
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos7
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora-rawhide
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora23
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuseleap
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
+    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1604
+
     - env: TEST=sanity INSTALL_DEPS=1 TOXENV=py24
       python: 2.7
     - env: TEST=sanity INSTALL_DEPS=1 TOXENV=py26
@@ -17,32 +46,8 @@ matrix:
     - env: TEST=sanity INSTALL_DEPS=1 TOXENV=py35
       python: 3.5
 
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos6
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos7
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora-rawhide
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora23
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuseleap
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
-    - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604
-
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos6
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:centos7
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora-rawhide
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:fedora23
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:opensuseleap
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
-    - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1604
-
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos6
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos7
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora-rawhide
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora23
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuseleap
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
-    - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1604
+    - env: TEST=code-smell INSTALL_DEPS=1
+      python: 2.7
 build:
   ci:
     - test/utils/shippable/ci.sh