diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0cfbb1aa..34487a7b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,7 +136,6 @@ rubocop:
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@@ -149,12 +148,9 @@ rubocop:
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # default-fedora-34-master-py3: {extends: '.test_instance'}
-# default-fedora-33-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -170,13 +166,10 @@ default-debian-11-3004-0-py3: {extends: '.test_instance'}
 default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
 default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-default-centos-8-3004-0-py3: {extends: '.test_instance'}
 # default-centos-7-3004-0-py3: {extends: '.test_instance'}
 # default-fedora-34-3004-0-py3: {extends: '.test_instance'}
-# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
 default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
 default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
@@ -185,61 +178,36 @@ default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
 default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
 default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
-# default-debian-11-3003-3-py3: {extends: '.test_instance'}
 default-debian-10-3003-3-py3: {extends: '.test_instance'}
 # default-debian-9-3003-3-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
 default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
 # default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-8-3003-3-py3: {extends: '.test_instance'}
 default-centos-7-3003-3-py3: {extends: '.test_instance'}
+default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 default-fedora-34-3003-3-py3: {extends: '.test_instance'}
-default-fedora-33-3003-3-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
+# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
 default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
 default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
 default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
 # default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
-# default-debian-11-3002-7-py3: {extends: '.test_instance'}
 # default-debian-10-3002-7-py3: {extends: '.test_instance'}
 default-debian-9-3002-7-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
-# default-centos-8-3002-7-py3: {extends: '.test_instance'}
 # default-centos-7-3002-7-py3: {extends: '.test_instance'}
+# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # default-fedora-34-3002-7-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
-# default-debian-10-3001-8-py3: {extends: '.test_instance'}
-# default-debian-9-3001-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
-# default-centos-8-3001-8-py3: {extends: '.test_instance'}
-# default-centos-7-3001-8-py3: {extends: '.test_instance'}
-# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
-# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 4a5e68306..2110e2e7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,6 @@ jobs:
     # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=default-centos-stream8-tiamat-py3
-    # - env: INSTANCE=default-centos-8-tiamat-py3
     # - env: INSTANCE=default-centos-7-tiamat-py3
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
@@ -102,12 +101,9 @@ jobs:
     # - env: INSTANCE=default-ubuntu-2004-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     # - env: INSTANCE=default-centos-stream8-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
     # - env: INSTANCE=default-centos-7-master-py3
     # - env: INSTANCE=default-fedora-34-master-py3
-    # - env: INSTANCE=default-fedora-33-master-py3
     # - env: INSTANCE=default-opensuse-leap-153-master-py3
-    # - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-oraclelinux-8-master-py3
@@ -123,13 +119,10 @@ jobs:
     - env: INSTANCE=default-ubuntu-2004-3004-0-py3
     # - env: INSTANCE=default-ubuntu-1804-3004-0-py3
     - env: INSTANCE=default-centos-stream8-3004-0-py3
-    - env: INSTANCE=default-centos-8-3004-0-py3
     # - env: INSTANCE=default-centos-7-3004-0-py3
     # - env: INSTANCE=default-fedora-34-3004-0-py3
-    # - env: INSTANCE=default-fedora-33-3004-0-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
+    - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
+    - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
     - env: INSTANCE=default-amazonlinux-2-3004-0-py3
     - env: INSTANCE=default-oraclelinux-8-3004-0-py3
     # - env: INSTANCE=default-oraclelinux-7-3004-0-py3
@@ -138,61 +131,36 @@ jobs:
     # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
     - env: INSTANCE=default-almalinux-8-3004-0-py3
     - env: INSTANCE=default-rockylinux-8-3004-0-py3
-    # - env: INSTANCE=default-debian-11-3003-3-py3
     - env: INSTANCE=default-debian-10-3003-3-py3
     # - env: INSTANCE=default-debian-9-3003-3-py3
     # - env: INSTANCE=default-ubuntu-2004-3003-3-py3
     - env: INSTANCE=default-ubuntu-1804-3003-3-py3
     # - env: INSTANCE=default-centos-stream8-3003-3-py3
-    # - env: INSTANCE=default-centos-8-3003-3-py3
     - env: INSTANCE=default-centos-7-3003-3-py3
+    - env: INSTANCE=default-fedora-35-3003-3-py3
     - env: INSTANCE=default-fedora-34-3003-3-py3
-    - env: INSTANCE=default-fedora-33-3003-3-py3
-    - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
-    - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
     # - env: INSTANCE=default-amazonlinux-2-3003-3-py3
     # - env: INSTANCE=default-oraclelinux-8-3003-3-py3
     - env: INSTANCE=default-oraclelinux-7-3003-3-py3
-    # - env: INSTANCE=default-arch-base-latest-3003-3-py3
     - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
     - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
     # - env: INSTANCE=default-almalinux-8-3003-3-py3
-    # - env: INSTANCE=default-debian-11-3002-7-py3
     # - env: INSTANCE=default-debian-10-3002-7-py3
     - env: INSTANCE=default-debian-9-3002-7-py3
     # - env: INSTANCE=default-ubuntu-2004-3002-7-py3
     # - env: INSTANCE=default-ubuntu-1804-3002-7-py3
-    # - env: INSTANCE=default-centos-8-3002-7-py3
     # - env: INSTANCE=default-centos-7-3002-7-py3
+    # - env: INSTANCE=default-fedora-35-3002-7-py3
     # - env: INSTANCE=default-fedora-34-3002-7-py3
-    # - env: INSTANCE=default-fedora-33-3002-7-py3
     # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
     # - env: INSTANCE=default-amazonlinux-2-3002-7-py3
     # - env: INSTANCE=default-oraclelinux-8-3002-7-py3
     # - env: INSTANCE=default-oraclelinux-7-3002-7-py3
-    # - env: INSTANCE=default-arch-base-latest-3002-7-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
-    # - env: INSTANCE=default-debian-10-3001-8-py3
-    # - env: INSTANCE=default-debian-9-3001-8-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-8-py3
-    # - env: INSTANCE=default-centos-8-3001-8-py3
-    # - env: INSTANCE=default-centos-7-3001-8-py3
-    # - env: INSTANCE=default-fedora-34-3001-8-py3
-    # - env: INSTANCE=default-fedora-33-3001-8-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-8-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index 3d29b68f1..4e07582c6 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -63,12 +63,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: centos-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
@@ -148,12 +142,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: centos-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:centos-8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
@@ -166,12 +154,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: fedora-33-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-33
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -182,16 +164,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: opensuse-leap-152-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: opensuse-tmbl-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@@ -294,12 +266,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: centos-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:centos-8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: centos-7-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:centos-7
@@ -312,12 +278,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: fedora-33-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:fedora-33
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: opensuse-leap-153-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
@@ -328,16 +288,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3004
-  - name: opensuse-leap-152-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3004
   - name: opensuse-tmbl-latest-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
@@ -399,13 +349,6 @@ platforms:
         saltmajorversion: 3004
 
   ## SALT `3003.3`
-  - name: debian-11-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:debian-11
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3003
   - name: debian-10-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:debian-10
@@ -440,27 +383,21 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3003
-  - name: centos-8-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:centos-8
-    verifier:
-      inputs:
-        saltmajorversion: 3003
   - name: centos-7-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-7
     verifier:
       inputs:
         saltmajorversion: 3003
-  - name: fedora-34-3003-3-py3
+  - name: fedora-35-3003-3-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-34
+      image: saltimages/salt-3003.3-py3:fedora-35
     verifier:
       inputs:
         saltmajorversion: 3003
-  - name: fedora-33-3003-3-py3
+  - name: fedora-34-3003-3-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-33
+      image: saltimages/salt-3003.3-py3:fedora-34
     verifier:
       inputs:
         saltmajorversion: 3003
@@ -474,16 +411,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3003
-  - name: opensuse-leap-152-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3003
   - name: opensuse-tmbl-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
@@ -512,12 +439,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3003
-  - name: arch-base-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:arch-base-latest
-    verifier:
-      inputs:
-        saltmajorversion: 3003
   - name: gentoo-stage3-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
@@ -539,13 +460,6 @@ platforms:
         saltmajorversion: 3003
 
   ## SALT `3002.7`
-  - name: debian-11-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:debian-11
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3002
   - name: debian-10-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:debian-10
@@ -574,27 +488,21 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3002
-  - name: centos-8-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:centos-8
-    verifier:
-      inputs:
-        saltmajorversion: 3002
   - name: centos-7-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:centos-7
     verifier:
       inputs:
         saltmajorversion: 3002
-  - name: fedora-34-3002-7-py3
+  - name: fedora-35-3002-7-py3
     driver:
-      image: saltimages/salt-3002.7-py3:fedora-34
+      image: saltimages/salt-3002.7-py3:fedora-35
     verifier:
       inputs:
         saltmajorversion: 3002
-  - name: fedora-33-3002-7-py3
+  - name: fedora-34-3002-7-py3
     driver:
-      image: saltimages/salt-3002.7-py3:fedora-33
+      image: saltimages/salt-3002.7-py3:fedora-34
     verifier:
       inputs:
         saltmajorversion: 3002
@@ -608,16 +516,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3002
-  - name: opensuse-leap-152-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3002
   - name: opensuse-tmbl-latest-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
@@ -646,12 +544,6 @@ platforms:
     verifier:
       inputs:
         saltmajorversion: 3002
-  - name: arch-base-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:arch-base-latest
-    verifier:
-      inputs:
-        saltmajorversion: 3002
   - name: gentoo-stage3-latest-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
@@ -666,127 +558,6 @@ platforms:
       inputs:
         saltmajorversion: 3002
 
-  ## SALT `3001.8`
-  - name: debian-10-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:debian-10
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: debian-9-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:debian-9
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: ubuntu-2004-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: ubuntu-1804-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: centos-8-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:centos-8
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: centos-7-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:centos-7
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: fedora-34-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:fedora-34
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: fedora-33-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:fedora-33
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: opensuse-leap-153-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: opensuse-leap-152-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: opensuse-tmbl-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: amazonlinux-2-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:amazonlinux-2
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: oraclelinux-8-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:oraclelinux-8
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: oraclelinux-7-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:oraclelinux-7
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: arch-base-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:arch-base-latest
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: gentoo-stage3-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-  - name: gentoo-stage3-systemd-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3001
-
 verifier:
   # https://www.inspec.io/
   name: inspec
diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls
index 0471b82e4..a7663c793 100644
--- a/test/salt/pillar/top.sls
+++ b/test/salt/pillar/top.sls
@@ -10,6 +10,4 @@ base:
     - v3003-py3
   'G@saltversioninfo:0:3002 and G@pythonversion:0:3':
     - v3002-py3
-  'G@saltversioninfo:0:3001 and G@pythonversion:0:3':
-    - v3001-py3
 ...