diff --git a/.travis.yml b/.travis.yml
index aa39c20e..a398cb1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ jobs:
     - env: INSTANCE=default-oraclelinux-8-master-py3
     - env: INSTANCE=default-oraclelinux-7-master-py3
     - env: INSTANCE=default-arch-base-latest-master-py3
-    - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
-    - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
+    - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+    - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
     - env: INSTANCE=default-almalinux-8-master-py3
     - env: INSTANCE=default-rockylinux-8-master-py3
     # - env: INSTANCE=default-debian-11-3003-3-py3
@@ -142,8 +142,8 @@ jobs:
     # - 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=gentoo-gentoo-stage3-latest-3003-3-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-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
@@ -161,8 +161,8 @@ jobs:
     # - 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=gentoo-gentoo-stage3-latest-3002-7-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-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
@@ -178,8 +178,8 @@ jobs:
     # - 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=gentoo-gentoo-stage3-latest-3001-8-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-8-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
     # <REMOVEME
 
     # Test the conversion of `template-formula` into another formula
diff --git a/CODEOWNERS b/CODEOWNERS
index 6d3d1d48..d14bb9b3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -25,6 +25,7 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
+/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf
diff --git a/kitchen.yml b/kitchen.yml
index 985a0924..9af4e1c5 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -17,6 +17,8 @@ provisioner:
   salt_copy_filter:
     - .kitchen
     - .git
+  pillars_from_directories:
+    - test/salt/pillar
 
 platforms:
   ## SALT `tiamat`
@@ -379,8 +381,6 @@ suites:
           '*':
             - TEMPLATE._mapdata
             - TEMPLATE
-      pillars_from_directories:
-        - test/salt/pillar
     verifier:
       inspec_tests:
         - path: test/integration/default
diff --git a/test/salt/pillar/defaults.sls b/test/salt/pillar/default.sls
similarity index 100%
rename from test/salt/pillar/defaults.sls
rename to test/salt/pillar/default.sls
diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls
index 449a546c..62d6c623 100644
--- a/test/salt/pillar/top.sls
+++ b/test/salt/pillar/top.sls
@@ -3,9 +3,8 @@
 ---
 base:
   '*':
-    - defaults
-  'os_family:Gentoo':
-    - match: grain
+    - default
+  'G@os_family:Gentoo':
     - gentoo
   'os:*':
     - define_roles