diff --git a/tests/pillar/kibana_client.sls b/tests/pillar/kibana_client.sls
index a4d7cb7..108a9aa 100644
--- a/tests/pillar/kibana_client.sls
+++ b/tests/pillar/kibana_client.sls
@@ -1,11 +1,12 @@
 kibana:
   client:
     enabled: true
+    version: 5
     default_index: 'log-*'
     object:
       logs:
         enabled: true
-        template: kibana/files/objects/dashboard_logs.json
+        template: kibana/files/v5/objects/dashboard_logs.json
         type: dashboard
       logs-directly:
         enabled: true
diff --git a/tests/pillar/kibana_debian_repo.sls b/tests/pillar/kibana_debian_repo.sls
index c2c1602..07f1657 100644
--- a/tests/pillar/kibana_debian_repo.sls
+++ b/tests/pillar/kibana_debian_repo.sls
@@ -3,6 +3,5 @@
     enabled: true
     repo:
       kibana_repo:
-        source: 'deb http://packages.elastic.co/kibana/4.1/debian stable main'
-        key_id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
-        key_server: hkp://p80.pool.sks-keyservers.net:80
\ No newline at end of file
+        source: "deb [arch=amd64] http://mirror.mirantis.com/testing/elasticsearch-5.x/{{ grains.get('oscodename') }} stable main"
+        key_url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
diff --git a/tests/pillar/kibana_server.sls b/tests/pillar/kibana_server.sls
index 83d7dc1..56242d9 100644
--- a/tests/pillar/kibana_server.sls
+++ b/tests/pillar/kibana_server.sls
@@ -1,6 +1,7 @@
 kibana:
   server:
     enabled: true
+    version: 5
     bind:
       address: 0.0.0.0
       port: 5601