diff --git a/tests/pillar/apache_single.sls b/tests/pillar/apache_single.sls
deleted file mode 100644
index c8802f0..0000000
--- a/tests/pillar/apache_single.sls
+++ /dev/null
@@ -1,50 +0,0 @@
- apache:
-   server:
-     enabled: true
-     bind:
-       address: 0.0.0.0
-       ports:
-       - 80
-       - 443
-       protocol: tcp
-     modules:
-     - ssl
-     - rewrite
-     default_mpm: prefork
-     mpm:
-       prefork:
-         servers:
-           start: 5
-           spare:
-             min: ${apache:server:mpm:prefork:servers:start}
-             max: 10
-           # Avoid memory leakage by restarting workers every x requests
-           max_requests: 0
-         # Should be 80% of server memory / average memory usage of one worker
-         max_clients: 150
-         # Should be same or more than max clients
-         limit: ${apache:server:mpm:prefork:max_clients}
-       event:
-         servers:
-           start: 5
-           spare:
-             min: 25
-             max: 75
-           threads_per_child: 25
-           # Avoid memory leakage by restarting workers every x requests
-           max_requests: 0
-         # Should be 80% of server memory / average memory usage of one worker
-         max_clients: 150
-         limit: 64
-       worker:
-         servers:
-           start: 5
-           spare:
-             min: 25
-             max: 75
-           threads_per_child: 25
-           # Avoid memory leakage by restarting workers every x requests
-           max_requests: 0
-         # Should be 80% of server memory / average memory usage of one worker
-         max_clients: 150
-         limit: 64
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index b493ab9..ea3822e 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -1,5 +1,3 @@
-include:
- - .apache_single
 horizon:
   server:
     enabled: true
@@ -90,3 +88,54 @@
         host: 127.0.0.1
         port: 80
         params: cookie ctl03 check inter 2000 fall 3
+
+apache:
+  server:
+    enabled: true
+    bind:
+      address: 0.0.0.0
+      ports:
+      - 80
+      - 443
+      protocol: tcp
+    modules:
+    - ssl
+    - rewrite
+    default_mpm: prefork
+    mpm:
+      prefork:
+        servers:
+          start: 5
+          spare:
+            min: ${apache:server:mpm:prefork:servers:start}
+            max: 10
+          # Avoid memory leakage by restarting workers every x requests
+          max_requests: 0
+        # Should be 80% of server memory / average memory usage of one worker
+        max_clients: 150
+        # Should be same or more than max clients
+        limit: ${apache:server:mpm:prefork:max_clients}
+      event:
+        servers:
+          start: 5
+          spare:
+            min: 25
+            max: 75
+          threads_per_child: 25
+          # Avoid memory leakage by restarting workers every x requests
+          max_requests: 0
+        # Should be 80% of server memory / average memory usage of one worker
+        max_clients: 150
+        limit: 64
+      worker:
+        servers:
+          start: 5
+          spare:
+            min: 25
+            max: 75
+          threads_per_child: 25
+          # Avoid memory leakage by restarting workers every x requests
+          max_requests: 0
+        # Should be 80% of server memory / average memory usage of one worker
+        max_clients: 150
+        limit: 64
diff --git a/tests/pillar/repo_mcp_openstack_ocata.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
new file mode 100644
index 0000000..e601208
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_ocata.sls
@@ -0,0 +1,44 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack_repo:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+        pin:
+        - pin: 'release a=ocata'
+          priority: 1050
+          package: '*'
+      mirantis_openstack_hotfix:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-hotfix main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+        pin:
+        - pin: 'release a=ocata-hotfix'
+          priority: 1050
+          package: '*'
+      mirantis_openstack_security:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-security main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+        pin:
+        - pin: 'release a=ocata-security'
+          priority: 1050
+          package: '*'
+      mirantis_openstack_updates:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-updates main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+        pin:
+        - pin: 'release a=ocata-uptades'
+          priority: 1050
+          package: '*'
+      mirantis_openstack_holdback:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-holdback main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+        pin:
+        - pin: 'release a=ocata-holdback'
+          priority: 1050
+          package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_pike.sls b/tests/pillar/repo_mcp_openstack_pike.sls
new file mode 100644
index 0000000..789b907
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_pike.sls
@@ -0,0 +1,12 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack_repo:
+        source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }} pike main"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }}/archive-mcppike.key"
+        pin:
+        - pin: 'release a=pike'
+          priority: 1050
+          package: '*'
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_queens.sls b/tests/pillar/repo_mcp_openstack_queens.sls
new file mode 100644
index 0000000..a8c7e77
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_queens.sls
@@ -0,0 +1,12 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack_repo:
+        source: "deb http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
+        pin:
+        - pin: 'release l=queens'
+          priority: 1050
+          package: '*'
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_rocky.sls b/tests/pillar/repo_mcp_openstack_rocky.sls
new file mode 100644
index 0000000..026ac5c
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_rocky.sls
@@ -0,0 +1,12 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack_repo:
+        source: "deb http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }}/archive-openstack-rocky.key"
+        pin:
+        - pin: 'release l=rocky'
+          priority: 1050
+          package: '*'
\ No newline at end of file
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index d7ca2f2..34ca7a6 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -1,5 +1,3 @@
-include:
- - .apache_single
 horizon:
   server:
     enabled: true
@@ -78,3 +76,54 @@
           name: "Material"
           description: "Google's Material Design style theme"
           path: "themes/material"
+
+apache:
+  server:
+    enabled: true
+    bind:
+      address: 0.0.0.0
+      ports:
+      - 80
+      - 443
+      protocol: tcp
+    modules:
+    - ssl
+    - rewrite
+    default_mpm: prefork
+    mpm:
+      prefork:
+        servers:
+          start: 5
+          spare:
+            min: ${apache:server:mpm:prefork:servers:start}
+            max: 10
+          # Avoid memory leakage by restarting workers every x requests
+          max_requests: 0
+        # Should be 80% of server memory / average memory usage of one worker
+        max_clients: 150
+        # Should be same or more than max clients
+        limit: ${apache:server:mpm:prefork:max_clients}
+      event:
+        servers:
+          start: 5
+          spare:
+            min: 25
+            max: 75
+          threads_per_child: 25
+          # Avoid memory leakage by restarting workers every x requests
+          max_requests: 0
+        # Should be 80% of server memory / average memory usage of one worker
+        max_clients: 150
+        limit: 64
+      worker:
+        servers:
+          start: 5
+          spare:
+            min: 25
+            max: 75
+          threads_per_child: 25
+          # Avoid memory leakage by restarting workers every x requests
+          max_requests: 0
+        # Should be 80% of server memory / average memory usage of one worker
+        max_clients: 150
+        limit: 64