diff --git a/shippable.yml b/shippable.yml
index 0a7f3af3d0..33e70134d1 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -16,15 +16,33 @@ matrix:
       python: 3.4
     - env: TEST=sanity INSTALL_DEPS=1 TOXENV=py35
       python: 3.5
-    - env: TEST=integration IMAGE=ansible/ansible:centos6
-    - env: TEST=integration IMAGE=ansible/ansible:centos7
-    - env: TEST=integration IMAGE=ansible/ansible:fedora-rawhide
-    - env: TEST=integration IMAGE=ansible/ansible:fedora23
-    - env: TEST=integration IMAGE=ansible/ansible:opensuseleap
-    - env: TEST=integration IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
-    - env: TEST=integration IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
-    - env: TEST=integration 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=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
 build:
   ci:
     - test/utils/shippable/ci.sh
diff --git a/test/integration/Makefile b/test/integration/Makefile
index 42bb9e1f17..73b0af6908 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -25,7 +25,9 @@ EUID := $(shell id -u -r)
 
 UNAME := $(shell uname | tr '[:upper:]' '[:lower:]')
 
-all: setup test_test_infra parsing test_var_precedence unicode test_templating_settings environment test_connection non_destructive destructive includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_gathering_facts test_binary_modules
+all: setup other non_destructive destructive
+
+other: test_test_infra parsing test_var_precedence unicode test_templating_settings environment test_connection includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_gathering_facts test_binary_modules
 
 test_test_infra:
 	# ensure fail/assert work locally and can stop execution with non-zero exit code