diff --git a/tests/pillar/minion.conf b/tests/pillar/minion.conf
new file mode 100644
index 0000000..ec54aa0
--- /dev/null
+++ b/tests/pillar/minion.conf
@@ -0,0 +1,12 @@
+
+id: control_single
+
+file_client: local
+
+file_roots:
+  base:
+    - /srv/salt
+
+pillar_roots:
+  base:
+    - /srv/pillar
\ No newline at end of file
diff --git a/tests/pillar/top.sls b/tests/pillar/top.sls
deleted file mode 100644
index d24cee2..0000000
--- a/tests/pillar/top.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-base:
-  '*':
-    - nova
diff --git a/tests/pillar/top_file.sls b/tests/pillar/top_file.sls
new file mode 100644
index 0000000..1ae9a02
--- /dev/null
+++ b/tests/pillar/top_file.sls
@@ -0,0 +1,4 @@
+
+base:
+  'compute_cluster':
+    - nova.compute_cluster
diff --git a/tests/pillar/top_pillar.sls b/tests/pillar/top_pillar.sls
new file mode 100644
index 0000000..0adc705
--- /dev/null
+++ b/tests/pillar/top_pillar.sls
@@ -0,0 +1,4 @@
+
+base:
+  'control_single':
+    - nova.control_single