diff --git a/.kitchen.yml b/.kitchen.yml
index eeb310a..cc0e724 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -59,7 +59,7 @@
   - name: single3
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/single.sls
+        opencontrail.sls: tests/pillar/single3.sls
   - name: single40
     provisioner:
       pillars-from-files:
@@ -69,7 +69,7 @@
   - name: analytics3
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics.sls
+        opencontrail.sls: tests/pillar/analytics3.sls
   - name: analytics40
     provisioner:
       pillars-from-files:
@@ -79,7 +79,7 @@
   - name: control3
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/control.sls
+        opencontrail.sls: tests/pillar/control3.sls
   - name: control40
     provisioner:
       pillars-from-files:
@@ -89,7 +89,7 @@
   - name: cluster3
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster.sls
+        opencontrail.sls: tests/pillar/cluster3.sls
   - name: cluster40
     provisioner:
       pillars-from-files:
@@ -99,7 +99,7 @@
   - name: tor3
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/tor.sls
+        opencontrail.sls: tests/pillar/tor3.sls
   - name: tor40
     provisioner:
       pillars-from-files:
@@ -109,7 +109,7 @@
   - name: vrouter3
     provisioner:
       pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter.sls
+        opencontrail.sls: tests/pillar/vrouter3.sls
     excludes:
       - ubuntu-trusty
   - name: vrouter40
diff --git a/tests/pillar/analytics.sls b/tests/pillar/analytics3.sls
similarity index 100%
rename from tests/pillar/analytics.sls
rename to tests/pillar/analytics3.sls
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster3.sls
similarity index 100%
rename from tests/pillar/cluster.sls
rename to tests/pillar/cluster3.sls
diff --git a/tests/pillar/control.sls b/tests/pillar/control3.sls
similarity index 100%
rename from tests/pillar/control.sls
rename to tests/pillar/control3.sls
diff --git a/tests/pillar/single.sls b/tests/pillar/single3.sls
similarity index 100%
rename from tests/pillar/single.sls
rename to tests/pillar/single3.sls
diff --git a/tests/pillar/vrouter-dpdk.sls b/tests/pillar/vrouter-dpdk3.sls
similarity index 100%
rename from tests/pillar/vrouter-dpdk.sls
rename to tests/pillar/vrouter-dpdk3.sls
diff --git a/tests/pillar/vrouter.sls b/tests/pillar/vrouter3.sls
similarity index 100%
rename from tests/pillar/vrouter.sls
rename to tests/pillar/vrouter3.sls