diff --git a/.travis.yml b/.travis.yml
index b1f9805..20c81b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,26 +30,26 @@ services:
 #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
 env:
   matrix:
-    - INSTANCE: default-debian-10-develop-py3
-    # - INSTANCE: default-ubuntu-1804-develop-py3
+    - INSTANCE: debian-debian-10-develop-py3
+    # - INSTANCE: ubuntu-ubuntu-1804-develop-py3
     # - INSTANCE: default-centos-7-develop-py3
     # - INSTANCE: default-fedora-30-develop-py3
     # - INSTANCE: default-opensuse-leap-15-develop-py3
     # - INSTANCE: default-amazonlinux-2-develop-py2
-    # - INSTANCE: default-debian-9-2019-2-py3
-    - INSTANCE: default-ubuntu-1804-2019-2-py3
+    # - INSTANCE: debian-debian-9-2019-2-py3
+    - INSTANCE: ubuntu-ubuntu-1804-2019-2-py3
     # - INSTANCE: default-centos-7-2019-2-py3
     # - INSTANCE: default-fedora-30-2019-2-py3
     # - INSTANCE: default-opensuse-leap-15-2019-2-py3
     - INSTANCE: default-amazonlinux-2-2019-2-py2
-    # - INSTANCE: default-debian-9-2018-3-py2
-    # - INSTANCE: default-ubuntu-1604-2018-3-py2
+    # - INSTANCE: debian-debian-9-2018-3-py2
+    # - INSTANCE: ubuntu-ubuntu-1604-2018-3-py2
     # - INSTANCE: default-centos-7-2018-3-py2
     - INSTANCE: default-fedora-29-2018-3-py2
     - INSTANCE: default-opensuse-leap-15-2018-3-py2
     # - INSTANCE: default-amazonlinux-2-2018-3-py2
-    # - INSTANCE: default-debian-8-2017-7-py2
-    # - INSTANCE: default-ubuntu-1604-2017-7-py2
+    # - INSTANCE: debian-debian-8-2017-7-py2
+    # - INSTANCE: ubuntu-ubuntu-1604-2017-7-py2
     - INSTANCE: default-centos-6-2017-7-py2
     # - INSTANCE: default-fedora-29-2017-7-py2
     # - INSTANCE: default-opensuse-leap-15-2017-7-py2
diff --git a/kitchen.yml b/kitchen.yml
index a4df842..3ffa3b9 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -133,7 +133,7 @@ verifier:
     - cli
 
 suites:
-  - name: default
+  - name: debian
     includes:
       - debian-10-develop-py3
       - debian-9-2019-2-py3
@@ -155,3 +155,24 @@ suites:
       inspec_tests:
         - path: test/integration/default
 
+  - name: ubuntu
+    includes:
+      - ubuntu-1804-develop-py3
+      - ubuntu-1804-2019-2-py3
+      - ubuntu-1604-2018-3-py2
+      - ubuntu-1604-2017-7-py2
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - packages
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - packages
+      pillars_from_files:
+        packages.sls: test/salt/pillar/pillar.example.ubuntu.1804
+    verifier:
+      inspec_tests:
+        - path: test/integration/default