diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cb1aa9..4350b9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,33 +123,50 @@ rubocop:
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
-v3001-py3-debian-10-3001-py3: {extends: '.test_instance'}
-# v3001-py3-debian-9-3001-py3: {extends: '.test_instance'}
-v3001-py3-ubuntu-2004-3001-py3: {extends: '.test_instance'}
-# v3001-py3-ubuntu-1804-3001-py3: {extends: '.test_instance'}
-v3001-py3-centos-8-3001-py3: {extends: '.test_instance'}
-# v3001-py3-centos-7-3001-py3: {extends: '.test_instance'}
-v3001-py3-fedora-32-3001-py3: {extends: '.test_instance'}
-# v3001-py3-fedora-31-3001-py3: {extends: '.test_instance'}
-# v3001-py3-opensuse-leap-152-3001-py3: {extends: '.test_instance'}
-# v3001-py3-amazonlinux-2-3001-py3: {extends: '.test_instance'}
-v3001-py3-oraclelinux-8-3001-py3: {extends: '.test_instance'}
-# v3001-py3-oraclelinux-7-3001-py3: {extends: '.test_instance'}
-v3001-py3-gentoo-stage3-latest-3001-py3: {extends: '.test_instance'}
-v3001-py3-gentoo-stage3-systemd-3001-py3: {extends: '.test_instance'}
-# v3000-py3-debian-10-3000-3-py3: {extends: '.test_instance'}
-# v3000-py3-debian-9-3000-3-py3: {extends: '.test_instance'}
-# v3000-py3-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# v3000-py3-centos-8-3000-3-py3: {extends: '.test_instance'}
-# v3000-py3-centos-7-3000-3-py3: {extends: '.test_instance'}
-v3000-py3-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
-v3000-py3-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
-# v3000-py3-oraclelinux-8-3000-3-py3: {extends: '.test_instance'}
-v3000-py3-oraclelinux-7-3000-3-py3: {extends: '.test_instance'}
-v3000-py2-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# v3000-py2-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
-# v3000-py3-gentoo-stage3-latest-3000-3-py3: {extends: '.test_instance'}
-# v3000-py3-gentoo-stage3-systemd-3000-3-py3: {extends: '.test_instance'}
+v3002-py3-debian-10-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-debian-9-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-centos-8-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-centos-7-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# v3002-py3-fedora-32-3002-2-py3: {extends: '.test_instance'}
+# v3002-py3-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
+v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-debian-9-3001-4-py3: {extends: '.test_instance'}
+v3001-py3-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+v3001-py3-centos-8-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-centos-7-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-fedora-33-3001-4-py3: {extends: '.test_instance'}
+v3001-py3-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
+# v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'}
+v3000-py3-debian-9-3000-6-py3: {extends: '.test_instance'}
+v3000-py3-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# v3000-py3-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# v3000-py3-centos-8-3000-6-py3: {extends: '.test_instance'}
+v3000-py3-centos-7-3000-6-py3: {extends: '.test_instance'}
+v3000-py3-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# v3000-py3-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# v3000-py3-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
+v3000-py3-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
+# v3000-py3-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
+# v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
+# v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 99dcd8b..9173308 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,33 +83,50 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    - env: INSTANCE=v3001-py3-debian-10-3001-py3
-    # - env: INSTANCE=v3001-py3-debian-9-3001-py3
-    - env: INSTANCE=v3001-py3-ubuntu-2004-3001-py3
-    # - env: INSTANCE=v3001-py3-ubuntu-1804-3001-py3
-    - env: INSTANCE=v3001-py3-centos-8-3001-py3
-    # - env: INSTANCE=v3001-py3-centos-7-3001-py3
-    - env: INSTANCE=v3001-py3-fedora-32-3001-py3
-    # - env: INSTANCE=v3001-py3-fedora-31-3001-py3
-    # - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-py3
-    # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-py3
-    - env: INSTANCE=v3001-py3-oraclelinux-8-3001-py3
-    # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-py3
-    - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-py3
-    - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-py3
-    # - env: INSTANCE=v3000-py3-debian-10-3000-3-py3
-    # - env: INSTANCE=v3000-py3-debian-9-3000-3-py3
-    # - env: INSTANCE=v3000-py3-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=v3000-py3-centos-8-3000-3-py3
-    # - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
-    - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-3-py3
-    - env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
-    # - env: INSTANCE=v3000-py3-oraclelinux-8-3000-3-py3
-    - env: INSTANCE=v3000-py3-oraclelinux-7-3000-3-py3
-    - env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
-    # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-3-py3
-    # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-3-py3
+    - env: INSTANCE=v3002-py3-debian-10-3002-2-py3
+    - env: INSTANCE=v3002-py3-debian-9-3002-2-py3
+    - env: INSTANCE=v3002-py3-ubuntu-2004-3002-2-py3
+    - env: INSTANCE=v3002-py3-ubuntu-1804-3002-2-py3
+    - env: INSTANCE=v3002-py3-ubuntu-1604-3002-2-py3
+    - env: INSTANCE=v3002-py3-centos-8-3002-2-py3
+    - env: INSTANCE=v3002-py3-centos-7-3002-2-py3
+    - env: INSTANCE=v3002-py3-fedora-33-3002-2-py3
+    # - env: INSTANCE=v3002-py3-fedora-32-3002-2-py3
+    # - env: INSTANCE=v3002-py3-opensuse-leap-152-3002-2-py3
+    - env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3
+    - env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3
+    - env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3
+    - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3
+    - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3
+    - env: INSTANCE=v3001-py3-debian-10-3001-4-py3
+    # - env: INSTANCE=v3001-py3-debian-9-3001-4-py3
+    - env: INSTANCE=v3001-py3-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=v3001-py3-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=v3001-py3-ubuntu-1604-3001-4-py3
+    - env: INSTANCE=v3001-py3-centos-8-3001-4-py3
+    # - env: INSTANCE=v3001-py3-centos-7-3001-4-py3
+    # - env: INSTANCE=v3001-py3-fedora-33-3001-4-py3
+    - env: INSTANCE=v3001-py3-fedora-32-3001-4-py3
+    # - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-4-py3
+    # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3
+    - env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3
+    # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3
+    # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3
+    # - env: INSTANCE=v3000-py3-debian-10-3000-6-py3
+    - env: INSTANCE=v3000-py3-debian-9-3000-6-py3
+    - env: INSTANCE=v3000-py3-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=v3000-py3-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=v3000-py3-centos-8-3000-6-py3
+    - env: INSTANCE=v3000-py3-centos-7-3000-6-py3
+    - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-6-py3
+    # - env: INSTANCE=v3000-py3-amazonlinux-2-3000-6-py3
+    # - env: INSTANCE=v3000-py3-oraclelinux-8-3000-6-py3
+    - env: INSTANCE=v3000-py3-oraclelinux-7-3000-6-py3
+    # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-6-py3
+    # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3
+    # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2
+    - env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index d7519ce..a8f5a05 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -11,144 +11,255 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
-  ## SALT `3001`
-  - name: debian-10-3001-py3
+  ## SALT `tiamat`
+  - name: debian-10-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:debian-10
-  - name: debian-9-3001-py3
+      image: saltimages/salt-tiamat-py3:debian-10
+  - name: debian-9-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:debian-9
-  - name: ubuntu-2004-3001-py3
+      image: saltimages/salt-tiamat-py3:debian-9
+  - name: ubuntu-2004-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-py3
+      image: saltimages/salt-tiamat-py3:ubuntu-20.04
+  - name: ubuntu-1804-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:ubuntu-18.04
-  - name: centos-8-3001-py3
+      image: saltimages/salt-tiamat-py3:ubuntu-18.04
+  - name: ubuntu-1604-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:centos-8
-  - name: centos-7-3001-py3
+      image: saltimages/salt-tiamat-py3:ubuntu-16.04
+  - name: centos-8-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:centos-7
-  - name: fedora-32-3001-py3
+      image: saltimages/salt-tiamat-py3:centos-8
+  - name: centos-7-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:fedora-32
-  - name: fedora-31-3001-py3
+      image: saltimages/salt-tiamat-py3:centos-7
+  - name: amazonlinux-2-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:fedora-31
-  - name: opensuse-leap-152-3001-py3
+      image: saltimages/salt-tiamat-py3:amazonlinux-2
+  - name: oraclelinux-8-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3001-py3
+      image: saltimages/salt-tiamat-py3:oraclelinux-8
+  - name: oraclelinux-7-tiamat-py3
     driver:
-      image: saltimages/salt-3001-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-py3
-    driver:
-      image: saltimages/salt-3001-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-py3
-    driver:
-      image: saltimages/salt-3001-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3001-py3
-    driver:
-      image: saltimages/salt-3001-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-py3
-    driver:
-      image: saltimages/salt-3001-py3:gentoo-stage3-systemd
+      image: saltimages/salt-tiamat-py3:oraclelinux-7
 
-  ## SALT `3000.3`
-  - name: debian-10-3000-3-py3
+  ## SALT `master`
+  - name: debian-10-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-master-py3:debian-10
+  - name: debian-9-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-master-py3:debian-9
+  - name: ubuntu-2004-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: centos-8-3000-3-py3
+      image: saltimages/salt-master-py3:ubuntu-20.04
+  - name: ubuntu-1804-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-8
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-master-py3:ubuntu-18.04
+  - name: ubuntu-1604-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: opensuse-leap-152-3000-3-py3
+      image: saltimages/salt-master-py3:ubuntu-16.04
+  - name: centos-8-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:opensuse-leap-15.2
+      image: saltimages/salt-master-py3:centos-8
+  - name: centos-7-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-7
+  - name: fedora-33-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-33
+  - name: fedora-32-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-32
+  - name: opensuse-leap-152-master-py3
+    driver:
+      image: saltimages/salt-master-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-3-py3
+  - name: amazonlinux-2-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-3-py3
+      image: saltimages/salt-master-py3:amazonlinux-2
+  - name: oraclelinux-8-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-3-py3
+      image: saltimages/salt-master-py3:oraclelinux-8
+  - name: gentoo-stage3-latest-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:oraclelinux-7
-  - name: ubuntu-1804-3000-3-py2
-    driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-3-py2
-    driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-16.04
-  - name: gentoo-stage3-latest-3000-3-py3
-    driver:
-      image: saltimages/salt-3000.3-py3:gentoo-stage3-latest
+      image: saltimages/salt-master-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-3-py3
+  - name: gentoo-stage3-systemd-master-py3
     driver:
-      image: saltimages/salt-3000.3-py3:gentoo-stage3-systemd
+      image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
-  ## SALT `2019.2`
-  - name: debian-10-2019-2-py3
+  ## SALT `3002.2`
+  - name: debian-10-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:debian-10
-  - name: debian-9-2019-2-py3
+      image: saltimages/salt-3002.2-py3:debian-10
+  - name: debian-9-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:debian-9
-  - name: ubuntu-1804-2019-2-py3
+      image: saltimages/salt-3002.2-py3:debian-9
+  - name: ubuntu-2004-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-18.04
-  - name: ubuntu-1604-2019-2-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-16.04
-  - name: centos-8-2019-2-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:centos-8
-  - name: centos-7-2019-2-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-16.04
+  - name: centos-8-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:centos-7
-  - name: fedora-31-2019-2-py3
+      image: saltimages/salt-3002.2-py3:centos-8
+  - name: centos-7-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-152-2019-2-py3
+      image: saltimages/salt-3002.2-py3:centos-7
+  - name: fedora-33-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
+      image: saltimages/salt-3002.2-py3:fedora-33
+  - name: fedora-32-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:fedora-32
+  - name: opensuse-leap-152-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-2019-2-py3
+  - name: amazonlinux-2-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py3:amazonlinux-2
-  - name: centos-6-2019-2-py2
+      image: saltimages/salt-3002.2-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py2:centos-6
+      image: saltimages/salt-3002.2-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:oraclelinux-7
+  - name: arch-base-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: amazonlinux-1-2019-2-py2
+  - name: gentoo-stage3-systemd-3002-2-py3
     driver:
-      image: saltimages/salt-2019.2-py2:amazonlinux-1
+      image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd
+
+  ## SALT `3001.4`
+  - name: debian-10-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:debian-10
+  - name: debian-9-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:debian-9
+  - name: ubuntu-2004-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+  - name: centos-8-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:centos-8
+  - name: centos-7-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:centos-7
+  - name: fedora-33-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:fedora-33
+  - name: fedora-32-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:fedora-32
+  - name: opensuse-leap-152-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:opensuse-leap-15.2
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:oraclelinux-7
+  - name: arch-base-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-latest
       run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd
+
+  ## SALT `3000.6`
+  - name: debian-10-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:debian-10
+  - name: debian-9-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:debian-9
+  - name: ubuntu-1804-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:ubuntu-16.04
+  - name: centos-8-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:centos-8
+  - name: centos-7-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:centos-7
+  - name: opensuse-leap-152-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:opensuse-leap-15.2
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd
+  - name: ubuntu-1804-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
 
 provisioner:
   name: salt_solo
@@ -169,22 +280,59 @@ verifier:
     - cli
 
 suites:
+  - name: v3002-py3
+    includes:
+      - debian-10-3002-2-py3
+      - debian-9-3002-2-py3
+      - ubuntu-2004-3002-2-py3
+      - ubuntu-1804-3002-2-py3
+      - ubuntu-1604-3002-2-py3
+      - centos-8-3002-2-py3
+      - centos-7-3002-2-py3
+      - fedora-33-3002-2-py3
+      - fedora-32-3002-2-py3
+      - opensuse-leap-152-3002-2-py3
+      - amazonlinux-2-3002-2-py3
+      - oraclelinux-8-3002-2-py3
+      - oraclelinux-7-3002-2-py3
+      - gentoo-stage3-latest-3002-2-py3
+      - gentoo-stage3-systemd-3002-2-py3
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - salt.pkgrepo
+            - salt.master
+            - salt.minion
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - salt
+              - v3002-py3
+      pillars_from_files:
+        salt.sls: test/salt/pillar/salt.sls
+        v3002-py3.sls: test/salt/pillar/v3002-py3.sls
+    verifier:
+      inspec_tests:
+        - path: test/integration/v3002-py3
   - name: v3001-py3
     includes:
-      - debian-10-3001-py3
-      - debian-9-3001-py3
-      - ubuntu-2004-3001-py3
-      - ubuntu-1804-3001-py3
-      - centos-8-3001-py3
-      - centos-7-3001-py3
-      - fedora-32-3001-py3
-      - fedora-31-3001-py3
-      - opensuse-leap-152-3001-py3
-      - amazonlinux-2-3001-py3
-      - oraclelinux-8-3001-py3
-      - oraclelinux-7-3001-py3
-      - gentoo-stage3-latest-3001-py3
-      - gentoo-stage3-systemd-3001-py3
+      - debian-10-3001-4-py3
+      - debian-9-3001-4-py3
+      - ubuntu-2004-3001-4-py3
+      - ubuntu-1804-3001-4-py3
+      - ubuntu-1604-3001-4-py3
+      - centos-8-3001-4-py3
+      - centos-7-3001-4-py3
+      - fedora-33-3001-4-py3
+      - fedora-32-3001-4-py3
+      - opensuse-leap-152-3001-4-py3
+      - amazonlinux-2-3001-4-py3
+      - oraclelinux-8-3001-4-py3
+      - oraclelinux-7-3001-4-py3
+      - gentoo-stage3-latest-3001-4-py3
+      - gentoo-stage3-systemd-3001-4-py3
     provisioner:
       state_top:
         base:
@@ -206,17 +354,18 @@ suites:
         - path: test/integration/v3001-py3
   - name: v3000-py3
     includes:
-      - debian-10-3000-3-py3
-      - debian-9-3000-3-py3
-      - ubuntu-1804-3000-3-py3
-      - centos-8-3000-3-py3
-      - centos-7-3000-3-py3
-      - opensuse-leap-152-3000-3-py3
-      - amazonlinux-2-3000-3-py3
-      - oraclelinux-8-3000-3-py3
-      - oraclelinux-7-3000-3-py3
-      - gentoo-stage3-latest-3000-3-py3
-      - gentoo-stage3-systemd-3000-3-py3
+      - debian-10-3000-6-py3
+      - debian-9-3000-6-py3
+      - ubuntu-1804-3000-6-py3
+      - ubuntu-1604-3000-6-py3
+      - centos-8-3000-6-py3
+      - centos-7-3000-6-py3
+      - opensuse-leap-152-3000-6-py3
+      - amazonlinux-2-3000-6-py3
+      - oraclelinux-8-3000-6-py3
+      - oraclelinux-7-3000-6-py3
+      - gentoo-stage3-latest-3000-6-py3
+      - gentoo-stage3-systemd-3000-6-py3
     provisioner:
       state_top:
         base:
@@ -238,8 +387,8 @@ suites:
         - path: test/integration/v3000-py3
   - name: v3000-py2
     includes:
-      - ubuntu-1804-3000-3-py2
-      - ubuntu-1604-3000-3-py2
+      - ubuntu-1804-3000-6-py2
+      - ubuntu-1604-3000-6-py2
     provisioner:
       state_top:
         base:
diff --git a/test/integration/v3002-py3/README.md b/test/integration/v3002-py3/README.md
new file mode 100644
index 0000000..32f3cfe
--- /dev/null
+++ b/test/integration/v3002-py3/README.md
@@ -0,0 +1,50 @@
+# InSpec Profile: `v3002-py3`
+
+This shows the implementation of the `v3002-py3` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+
+## Verify a profile
+
+InSpec ships with built-in features to verify a profile structure.
+
+```bash
+$ inspec check v3002-py3
+Summary
+-------
+Location: v3002-py3
+Profile: profile
+Controls: 4
+Timestamp: 2019-06-24T23:09:01+00:00
+Valid: true
+
+Errors
+------
+
+Warnings
+--------
+```
+
+## Execute a profile
+
+To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
+
+```bash
+$ inspec exec v3002-py3
+..
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+8 examples, 0 failures
+```
+
+## Execute a specific control from a profile
+
+To run one control from the profile use `inspec exec /path/to/profile --controls name`.
+
+```bash
+$ inspec exec v3002-py3 --controls package
+.
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+1 examples, 0 failures
+```
+
+See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).
diff --git a/test/integration/v3002-py3/controls/pkgs_spec.rb b/test/integration/v3002-py3/controls/pkgs_spec.rb
new file mode 100644
index 0000000..b1aa8ab
--- /dev/null
+++ b/test/integration/v3002-py3/controls/pkgs_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+control 'salt packages' do
+  title 'should be installed'
+
+  version = '3002'
+
+  %w[
+    salt-master
+    salt-minion
+  ].each do |p|
+    describe package(p) do
+      it { should be_installed }
+      its('version') { should match(/^#{version}/) }
+    end
+  end
+end
diff --git a/test/integration/v3002-py3/controls/service_spec.rb b/test/integration/v3002-py3/controls/service_spec.rb
new file mode 100644
index 0000000..9d99883
--- /dev/null
+++ b/test/integration/v3002-py3/controls/service_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+control 'salt services' do
+  title 'should be running'
+
+  %w[
+    salt-master
+    salt-minion
+  ].each do |p|
+    describe service(p) do
+      it { should be_installed }
+      it { should be_enabled }
+      it { should be_running }
+    end
+  end
+end
diff --git a/test/integration/v3002-py3/inspec.yml b/test/integration/v3002-py3/inspec.yml
new file mode 100644
index 0000000..9e358ee
--- /dev/null
+++ b/test/integration/v3002-py3/inspec.yml
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+name: v3002-py3
+title: salt formula
+maintainer: SaltStack Formulas
+license: Apache-2.0
+summary: Verify that Salt `v3002-py3` is setup and configured
+supports:
+  - platform-name: debian
+  - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
diff --git a/test/salt/pillar/v3002-py3.sls b/test/salt/pillar/v3002-py3.sls
new file mode 100644
index 0000000..aca5306
--- /dev/null
+++ b/test/salt/pillar/v3002-py3.sls
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+salt:
+  release: '3002'
+  py_ver: 'py3'