diff --git a/tests/pillar/_ssl_agent.sls b/tests/pillar/_ssl_agent.sls
new file mode 100644
index 0000000..08fa0c5
--- /dev/null
+++ b/tests/pillar/_ssl_agent.sls
@@ -0,0 +1,16 @@
+ceilometer:
+  agent:
+    enabled: true
+    version: pike
+    identity:
+      protocol: https
+    message_queue:
+      port: 5671
+      ssl:
+        enabled: true
+        version: '2.1'
+        cacert_file: /etc/ceilometer/cacert.pem
+        cacert: |
+          -----BEGIN CERTIFICATE-----
+          MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+          -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/pillar/_ssl_server.sls b/tests/pillar/_ssl_server.sls
new file mode 100644
index 0000000..ab722b4
--- /dev/null
+++ b/tests/pillar/_ssl_server.sls
@@ -0,0 +1,31 @@
+ceilometer:
+  server:
+    enabled: true
+    version: pike
+    identity:
+      protocol: https
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: ceilometer
+      password: password
+      endpoint_type: internalURL
+    bind:
+      host: 127.0.0.1
+      port: 8777
+    ttl: 86400
+    message_queue:
+      host: 127.0.0.1
+      port: 5671
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+      ssl:
+        enabled: true
+        version: '2.1'
+        cacert_file: /etc/ceilometer/cacert.pem
+        cacert: |
+          -----BEGIN CERTIFICATE-----
+          MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
+          -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_mitaka.sls b/tests/pillar/repo_mcp_openstack_mitaka.sls
deleted file mode 100644
index ea24305..0000000
--- a/tests/pillar/repo_mcp_openstack_mitaka.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack_repo:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_hotfix:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-hotfix main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-hotfix'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_security:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-security main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-security'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_updates:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-updates main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-uptades'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_holdback:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-holdback main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-holdback'
-          priority: 1050
-          package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_newton.sls b/tests/pillar/repo_mcp_openstack_newton.sls
deleted file mode 100644
index 2bdfb69..0000000
--- a/tests/pillar/repo_mcp_openstack_newton.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack_repo:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
-        pin:
-        - pin: 'release a=newton'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_hotfix:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-hotfix main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
-        pin:
-        - pin: 'release a=newton-hotfix'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_security:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-security main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
-        pin:
-        - pin: 'release a=newton-security'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_updates:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-updates main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
-        pin:
-        - pin: 'release a=newton-updates'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_holdback:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-holdback main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
-        pin:
-        - pin: 'release a=newton-holdback'
-          priority: 1050
-          package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_ocata.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
deleted file mode 100644
index e601208..0000000
--- a/tests/pillar/repo_mcp_openstack_ocata.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-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
index 789b907..fe6af3c 100644
--- a/tests/pillar/repo_mcp_openstack_pike.sls
+++ b/tests/pillar/repo_mcp_openstack_pike.sls
@@ -3,10 +3,10 @@
     enabled: true
     repo:
       mirantis_openstack_repo:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }} pike main"
+        source: "deb http://mirror.mirantis.com/update/2019.2.0/openstack-pike/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }}/archive-mcppike.key"
+        key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-pike/{{ grains.get('oscodename') }}/archive-pike.key"
         pin:
-        - pin: 'release a=pike'
+        - pin: 'release l=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..ebe1964
--- /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/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
+        pin:
+        - pin: 'release l=queens'
+          priority: 1050
+          package: '*'
\ No newline at end of file