diff --git a/apt/dist_upgrade.sls b/apt/dist_upgrade.sls
index 2da6fa5..74b751d 100644
--- a/apt/dist_upgrade.sls
+++ b/apt/dist_upgrade.sls
@@ -1,5 +1,5 @@
 apt-get -y dist-upgrade:
-  cmd.wait:
-    - watch:
+  cmd.run:
+    - onchanges:
       - file: /etc/apt/sources.list
       - file: /etc/apt/sources.list.d
diff --git a/apt/update.sls b/apt/update.sls
index e83a114..6bd27bb 100644
--- a/apt/update.sls
+++ b/apt/update.sls
@@ -1,5 +1,5 @@
 apt-get -y update:
-  cmd.wait:
-    - watch:
+  cmd.run:
+    - onchanges:
       - file: /etc/apt/sources.list
       - file: /etc/apt/sources.list.d
diff --git a/apt/upgrade.sls b/apt/upgrade.sls
index 7171769..483bd09 100644
--- a/apt/upgrade.sls
+++ b/apt/upgrade.sls
@@ -1,5 +1,5 @@
 apt-get -y upgrade:
-  cmd.wait:
-    - watch:
+  cmd.run:
+    - onchanges:
       - file: /etc/apt/sources.list
       - file: /etc/apt/sources.list.d
diff --git a/kitchen.yml b/kitchen.yml
index f6501c4..50f1ef7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -144,7 +144,7 @@ suites:
             '*':
               - apt
       pillars_from_files:
-        apt.sls: test/salt/pillar/repositories.pillar.sls
+        apt.sls: test/salt/pillar/repositories.sls
     verifier:
       inspec_tests:
         - path: test/integration/repositories
@@ -161,7 +161,7 @@ suites:
             '*':
               - apt
       pillars_from_files:
-        apt.sls: test/salt/pillar/preferences.pillar.sls
+        apt.sls: test/salt/pillar/preferences.sls
     verifier:
       inspec_tests:
         - path: test/integration/preferences
@@ -178,7 +178,7 @@ suites:
             '*':
               - apt
       pillars_from_files:
-        apt.sls: test/salt/pillar/unattended.pillar.sls
+        apt.sls: test/salt/pillar/unattended.sls
     verifier:
       inspec_tests:
         - path: test/integration/unattended
diff --git a/test/salt/pillar/preferences.pillar.sls b/test/salt/pillar/preferences.sls
similarity index 100%
rename from test/salt/pillar/preferences.pillar.sls
rename to test/salt/pillar/preferences.sls
diff --git a/test/salt/pillar/repositories.pillar.sls b/test/salt/pillar/repositories.sls
similarity index 100%
rename from test/salt/pillar/repositories.pillar.sls
rename to test/salt/pillar/repositories.sls
diff --git a/test/salt/pillar/unattended.pillar.sls b/test/salt/pillar/unattended.sls
similarity index 100%
rename from test/salt/pillar/unattended.pillar.sls
rename to test/salt/pillar/unattended.sls