diff --git a/tests/pillar/designate_liberty.sls b/tests/pillar/designate_liberty.sls
deleted file mode 100644
index d43dee8..0000000
--- a/tests/pillar/designate_liberty.sls
+++ /dev/null
@@ -1,65 +0,0 @@
-designate:
-  pool_manager:
-    enabled: true
-  server:
-    enabled: true
-    bind:
-      api:
-        address: 127.0.0.1
-    region: RegionOne
-    domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    version: liberty
-    mdns:
-      address: 0.0.0.0
-      port: 5354
-    admin_api:
-      enabled: true
-      enabled_extensions_admin: quotas
-    database:
-      engine: mysql
-      host: 127.0.0.1
-      port: 3306
-      name:
-        main_database: designate
-        pool_manager: designate_pool_manager
-      user: designate
-      password: passw0rd
-    message_queue:
-      engine: rabbitmq
-      members:
-        - host: 127.0.0.1
-        - host: 127.0.1.1
-        - host: 127.0.2.1
-      user: openstack
-      password: password
-      virtual_host: '/openstack'
-    identity:
-      host: 127.0.0.1
-      port: 35357
-      user: designate
-    logging:
-      log_appender: false
-      log_handlers:
-        watchedfile:
-          enabled: true
-        fluentd:
-          enabled: false
-        ossyslog:
-          enabled: false
-    pool:
-      pool_id: cae73b6f-95eb-4a7d-a567-099ae6176e08
-      nameservers:
-        - uuid: 690d7bc8-811b-404c-abcc-9cec54d87092
-          host: 127.0.0.1
-          port: 53
-        - uuid: bc5ddcf0-8d95-4f87-b435-9ff831a4a14c
-          host: 127.0.1.1
-          port: 53
-        - uuid: a43d5375-a5ec-4077-8c87-ec0b08fa3bd1
-          host: 127.0.2.1
-          port: 53
-      targets:
-        uuid: f26e0b32-736f-4f0a-831b-039a415c481e
-        options: 'port: 53, host: 127.0.0.1'
-        masters: 127.0.0.1:5354
-        type:  bind9
diff --git a/tests/pillar/designate_ocata.sls b/tests/pillar/designate_ocata.sls
deleted file mode 100644
index 93e7e7a..0000000
--- a/tests/pillar/designate_ocata.sls
+++ /dev/null
@@ -1,169 +0,0 @@
-designate:
-  _support:
-    sensu:
-      enabled: false
-  server:
-    enabled: true
-    region: RegionOne
-    domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    version: ocata
-    api:
-      quotas_verify_project_id: false
-    bind:
-      api:
-        address: 127.0.0.1
-    admin_api:
-      enabled: true
-      enabled_extensions_admin: quotas
-    database:
-      engine: mysql
-      host: 127.0.0.1
-      port: 3306
-      name:
-        main_database: designate
-        pool_manager: designate_pool_manager
-      user: designate
-      password: passw0rd
-    identity:
-      engine: keystone
-      host: 127.0.0.1
-      port: 35357
-      tenant: service
-      user: designate
-      password: passw0rd
-    mdns:
-      address: 0.0.0.0
-      port: 5354
-    message_queue:
-      engine: rabbitmq
-      members:
-      - host: 127.0.0.1
-      user: openstack
-      password: password
-      virtual_host: '/openstack'
-    logging:
-      log_appender: false
-      log_handlers:
-        watchedfile:
-          enabled: true
-        fluentd:
-          enabled: false
-        ossyslog:
-          enabled: false
-    pools:
-      default:
-        description: 'default pool'
-        attributes:
-          service_tier: GOLD
-          test_attr: test_value
-        ns_records:
-          - hostname: 'ns1.example.org.'
-            priority: 10
-        nameservers:
-          - host: 127.0.0.1
-            port: 53
-          - host: 127.0.1.1
-            port: 53
-          - host: 127.0.2.1
-            port: 53
-        targets:
-          default_target:
-            type: bind9
-            description: 'default target'
-            masters:
-              - host: 127.0.0.1
-                port: 5354
-            options:
-              host: 127.0.0.1
-              port: 53
-              rndc_host: 127.0.0.1
-              rndc_port: 953
-              rndc_key_file: /etc/designate/rndc.key
-        also_notifies:
-          - host: 127.0.3.1
-            port: 53
-    quota:
-      zones: 40
-  worker:
-    enabled: true
-    logging:
-      log_appender: false
-      log_handlers:
-        watchedfile:
-          enabled: true
-        fluentd:
-          enabled: false
-        ossyslog:
-          enabled: false
-mysql:
-  client:
-    enabled: true
-    version: '5.7'
-    admin:
-      host: localhost
-      port: 3306
-      user: admin
-      password: password
-      encoding: utf8
-  server:
-    enabled: true
-    version: "5.7"
-    force_encoding: utf8
-    bind:
-      address: 0.0.0.0
-      port: 3306
-      protocol: tcp
-    database:
-      designate:
-        encoding: utf8
-        users:
-        - host: '%'
-          name: designate
-          password: passw0rd
-          rights: all
-        - host: 127.0.0.1
-          name: designate
-          password: passw0rd
-          rights: all
-      designate_pool_manager:
-        encoding: utf8
-        users:
-        - host: '%'
-          name: designate
-          password: passw0rd
-          rights: all
-        - host: 127.0.0.1
-          name: designate
-          password: passw0rd
-          rights: all
-# On xenial rabbitmq fails to start inside docker on MK CI
-# rabbitmq:
-#   server:
-#     enabled: true
-#     bind:
-#       address: 0.0.0.0
-#       port: 5672
-#     secret_key: rabbit_master_cookie
-#     admin:
-#       name: adminuser
-#       password: pwd
-#     host:
-#       '/':
-#         enabled: true
-#         user: guest
-#         password: guest
-#         policies:
-#         - name: HA
-#           pattern: '^(?!amq\.).*'
-#           definition: '{"ha-mode": "all", "message-ttl": 120000}'
-#       '/openstack':
-#         enabled: true
-#         user: openstack
-#         password: password
-#         policies:
-#         - name: HA
-#           pattern: '^(?!amq\.).*'
-#           definition: '{"ha-mode": "all", "message-ttl": 120000}'
-#     memory:
-#       vm_high_watermark: 0.4
-#     plugins: ['']
diff --git a/tests/pillar/repo_mcp_openstack.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
similarity index 100%
rename from tests/pillar/repo_mcp_openstack.sls
rename to tests/pillar/repo_mcp_openstack_ocata.sls
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/server_cluster.sls b/tests/pillar/server_cluster.sls
new file mode 100644
index 0000000..2313ef7
--- /dev/null
+++ b/tests/pillar/server_cluster.sls
@@ -0,0 +1,99 @@
+designate:
+  _support:
+    sensu:
+      enabled: false
+  server:
+    enabled: true
+    region: RegionOne
+    domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    version: ocata
+    api:
+      quotas_verify_project_id: false
+    bind:
+      api:
+        address: 127.0.0.1
+    admin_api:
+      enabled: true
+      enabled_extensions_admin: quotas
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name:
+        main_database: designate
+        pool_manager: designate_pool_manager
+      user: designate
+      password: passw0rd
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: designate
+      password: passw0rd
+    mdns:
+      address: 0.0.0.0
+      port: 5354
+    message_queue:
+      engine: rabbitmq
+      members:
+      - host: 127.0.0.1
+      - host: 127.0.0.2
+      - host: 127.0.0.3
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
+    pools:
+      default:
+        description: 'default pool'
+        attributes:
+          service_tier: GOLD
+          test_attr: test_value
+        ns_records:
+          - hostname: 'ns1.example.org.'
+            priority: 10
+        nameservers:
+          - host: 127.0.0.1
+            port: 53
+          - host: 127.0.1.1
+            port: 53
+          - host: 127.0.2.1
+            port: 53
+        targets:
+          default_target:
+            type: bind9
+            description: 'default target'
+            masters:
+              - host: 127.0.0.1
+                port: 5354
+            options:
+              host: 127.0.0.1
+              port: 53
+              rndc_host: 127.0.0.1
+              rndc_port: 953
+              rndc_key_file: /etc/designate/rndc.key
+        also_notifies:
+          - host: 127.0.3.1
+            port: 53
+    quota:
+      zones: 40
+  worker:
+    enabled: true
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
\ No newline at end of file
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
new file mode 100644
index 0000000..ea81a3b
--- /dev/null
+++ b/tests/pillar/server_single.sls
@@ -0,0 +1,97 @@
+designate:
+  _support:
+    sensu:
+      enabled: false
+  server:
+    enabled: true
+    region: RegionOne
+    domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    version: ocata
+    api:
+      quotas_verify_project_id: false
+    bind:
+      api:
+        address: 127.0.0.1
+    admin_api:
+      enabled: true
+      enabled_extensions_admin: quotas
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name:
+        main_database: designate
+        pool_manager: designate_pool_manager
+      user: designate
+      password: passw0rd
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: designate
+      password: passw0rd
+    mdns:
+      address: 0.0.0.0
+      port: 5354
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
+    pools:
+      default:
+        description: 'default pool'
+        attributes:
+          service_tier: GOLD
+          test_attr: test_value
+        ns_records:
+          - hostname: 'ns1.example.org.'
+            priority: 10
+        nameservers:
+          - host: 127.0.0.1
+            port: 53
+          - host: 127.0.1.1
+            port: 53
+          - host: 127.0.2.1
+            port: 53
+        targets:
+          default_target:
+            type: bind9
+            description: 'default target'
+            masters:
+              - host: 127.0.0.1
+                port: 5354
+            options:
+              host: 127.0.0.1
+              port: 53
+              rndc_host: 127.0.0.1
+              rndc_port: 953
+              rndc_key_file: /etc/designate/rndc.key
+        also_notifies:
+          - host: 127.0.3.1
+            port: 53
+    quota:
+      zones: 40
+  worker:
+    enabled: true
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
\ No newline at end of file
diff --git a/tests/pillar/ssl.sls b/tests/pillar/ssl.sls
deleted file mode 100644
index 7168c35..0000000
--- a/tests/pillar/ssl.sls
+++ /dev/null
@@ -1,12 +0,0 @@
-include:
-  - .designate_ocata
-
-designate:
-  server:
-    database:
-      ssl:
-        enabled: True
-    message_queue:
-      port: 5671
-      ssl:
-        enabled: True