diff --git a/shippable.yml b/shippable.yml
index 2d435aa..ba91c5f 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -54,88 +54,24 @@ matrix:
     - env: T=linux/ubuntu1604/1
     - env: T=linux/ubuntu1804/1
 
-    - env: T=aix/7.2/2
-    - env: T=osx/10.11/2
-    - env: T=rhel/7.6/2
-    - env: T=rhel/8.1/2
-    - env: T=freebsd/11.1/2
-    - env: T=freebsd/12.1/2
-    - env: T=linux/centos6/2
-    - env: T=linux/centos7/2
-    - env: T=linux/centos8/2
-    - env: T=linux/fedora30/2
-    - env: T=linux/fedora31/2
-    - env: T=linux/opensuse15py2/2
-    - env: T=linux/opensuse15/2
-    - env: T=linux/ubuntu1604/2
-    - env: T=linux/ubuntu1804/2
-
-    - env: T=aix/7.2/3
-    - env: T=osx/10.11/3
-    - env: T=rhel/7.6/3
-    - env: T=rhel/8.1/3
-    - env: T=freebsd/11.1/3
-    - env: T=freebsd/12.1/3
-    - env: T=linux/centos6/3
-    - env: T=linux/centos7/3
-    - env: T=linux/centos8/3
-    - env: T=linux/fedora30/3
-    - env: T=linux/fedora31/3
-    - env: T=linux/opensuse15py2/3
-    - env: T=linux/opensuse15/3
-    - env: T=linux/ubuntu1604/3
-    - env: T=linux/ubuntu1804/3
-
-    - env: T=aix/7.2/4
-    - env: T=osx/10.11/4
-    - env: T=rhel/7.6/4
-    - env: T=rhel/8.1/4
-    - env: T=freebsd/11.1/4
-    - env: T=freebsd/12.1/4
-    - env: T=linux/centos6/4
-    - env: T=linux/centos7/4
-    - env: T=linux/centos8/4
-    - env: T=linux/fedora30/4
-    - env: T=linux/fedora31/4
-    - env: T=linux/opensuse15py2/4
-    - env: T=linux/opensuse15/4
-    - env: T=linux/ubuntu1604/4
-    - env: T=linux/ubuntu1804/4
-
-    - env: T=aix/7.2/5
-    - env: T=osx/10.11/5
-    - env: T=rhel/7.6/5
-    - env: T=rhel/8.1/5
-    - env: T=freebsd/11.1/5
-    - env: T=freebsd/12.1/5
-    - env: T=linux/centos6/5
-    - env: T=linux/centos7/5
-    - env: T=linux/centos8/5
-    - env: T=linux/fedora30/5
-    - env: T=linux/fedora31/5
-    - env: T=linux/opensuse15py2/5
-    - env: T=linux/opensuse15/5
-    - env: T=linux/ubuntu1604/5
-    - env: T=linux/ubuntu1804/5
-
     - env: T=fallaxy/2.7/1
     - env: T=fallaxy/3.6/1
 
-    - env: T=i/aix/7.2
-    - env: T=i/osx/10.11
-    - env: T=i/rhel/7.6
-    - env: T=i/rhel/8.1
-    - env: T=i/freebsd/11.1
-    - env: T=i/freebsd/12.1
-    - env: T=i/linux/centos6
-    - env: T=i/linux/centos7
-    - env: T=i/linux/centos8
-    - env: T=i/linux/fedora30
-    - env: T=i/linux/fedora31
-    - env: T=i/linux/opensuse15py2
-    - env: T=i/linux/opensuse15
-    - env: T=i/linux/ubuntu1604
-    - env: T=i/linux/ubuntu1804
+#    - env: T=i/aix/7.2
+#    - env: T=i/osx/10.11
+#    - env: T=i/rhel/7.6
+#    - env: T=i/rhel/8.1
+#    - env: T=i/freebsd/11.1
+#    - env: T=i/freebsd/12.1
+#    - env: T=i/linux/centos6
+#    - env: T=i/linux/centos7
+#    - env: T=i/linux/centos8
+#    - env: T=i/linux/fedora30
+#    - env: T=i/linux/fedora31
+#    - env: T=i/linux/opensuse15py2
+#    - env: T=i/linux/opensuse15
+#    - env: T=i/linux/ubuntu1604
+#    - env: T=i/linux/ubuntu1804
 
 branches:
   except:
diff --git a/tests/integration/targets/acl/aliases b/tests/integration/targets/acl/aliases
index ed821c2..f8e28c7 100644
--- a/tests/integration/targets/acl/aliases
+++ b/tests/integration/targets/acl/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group1
 skip/aix
diff --git a/tests/integration/targets/authorized_key/aliases b/tests/integration/targets/authorized_key/aliases
index 9af2d79..80ec6bc 100644
--- a/tests/integration/targets/authorized_key/aliases
+++ b/tests/integration/targets/authorized_key/aliases
@@ -1,2 +1,2 @@
 needs/root
-shippable/posix/group2
+shippable/posix/group1
diff --git a/tests/integration/targets/mount/aliases b/tests/integration/targets/mount/aliases
index 77b5220..fa6da2b 100644
--- a/tests/integration/targets/mount/aliases
+++ b/tests/integration/targets/mount/aliases
@@ -1,4 +1,4 @@
 needs/privileged
 needs/root
-shippable/posix/group2
+shippable/posix/group1
 skip/aix
diff --git a/tests/integration/targets/patch/aliases b/tests/integration/targets/patch/aliases
index 9a80b36..3a07aab 100644
--- a/tests/integration/targets/patch/aliases
+++ b/tests/integration/targets/patch/aliases
@@ -1,3 +1,3 @@
 destructive
-shippable/posix/group2
+shippable/posix/group1
 skip/aix
diff --git a/tests/integration/targets/seboolean/aliases b/tests/integration/targets/seboolean/aliases
index 58a2a31..4d94546 100644
--- a/tests/integration/targets/seboolean/aliases
+++ b/tests/integration/targets/seboolean/aliases
@@ -1,3 +1,3 @@
 needs/root
-shippable/posix/group2
+shippable/posix/group1
 skip/aix
diff --git a/tests/integration/targets/selinux/aliases b/tests/integration/targets/selinux/aliases
index 58a2a31..4d94546 100644
--- a/tests/integration/targets/selinux/aliases
+++ b/tests/integration/targets/selinux/aliases
@@ -1,3 +1,3 @@
 needs/root
-shippable/posix/group2
+shippable/posix/group1
 skip/aix
diff --git a/tests/integration/targets/synchronize/aliases b/tests/integration/targets/synchronize/aliases
index 765b70d..a6dafcf 100644
--- a/tests/integration/targets/synchronize/aliases
+++ b/tests/integration/targets/synchronize/aliases
@@ -1 +1 @@
-shippable/posix/group2
+shippable/posix/group1