diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index a8f0633..3a5d91f 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -1,53 +1,58 @@
-  galera:
-    master:
-      enabled: true
-      name: galeracluster
-      bind:
-        address: 127.0.0.1
-        port: 3306
-      maintenance_password: password
-      admin:
-        user: root
-        password: password
-      members:
-      - host: 127.0.0.1
-        port: 4567
-      - host: 127.0.0.1
-        port: 4567
-      - host: 127.0.0.1
-        port: 4567
-    clustercheck:
-      enabled: True
-      user: clustercheck
+galera:
+  master:
+    enabled: true
+    name: galeracluster
+    bind:
+      address: 127.0.0.1
+      port: 3306
+    maintenance_password: password
+    admin:
+      user: root
       password: password
-      available_when_donor: 1
-      available_when_readonly: 1
-      port: 9200
-      max_connections: 20000
-      innodb_buffer_pool_size: 3138M
-  mysql:
-    server:
-      database:
-        mydb:
-          encoding: 'utf8'
-      users:
-      - name: haproxy
-        host: localhost
-      - name: haproxy
-        host: '%'
-      - name: haproxy
-        host: 127.0.0.1
-      - name: clustercheck
-        #host: localhost
-        password: password
-        database: '*.*'
-        grants: PROCESS
-      - name: inspector
-        host: 127.0.0.1
-        password: password
-        databases:
-          - database: mydb
-            table: mytable
-            grant_option: True
-            grants:
-            - all privileges
+    members:
+    - host: 127.0.0.1
+      port: 4567
+    - host: 127.0.0.1
+      port: 4567
+    - host: 127.0.0.1
+      port: 4567
+  clustercheck:
+    enabled: True
+    user: clustercheck
+    password: password
+    available_when_donor: 1
+    available_when_readonly: 1
+    port: 9200
+    max_connections: 20000
+    innodb_buffer_pool_size: 3138M
+mysql:
+  server:
+    enabled: true
+    bind:
+      address: 0.0.0.0
+      port: 3306
+      protocol: tcp
+    database:
+      mydb:
+        encoding: 'utf8'
+    users:
+    - name: haproxy
+      host: localhost
+    - name: haproxy
+      host: '%'
+    - name: haproxy
+      host: 127.0.0.1
+    - name: clustercheck
+      #host: localhost
+      password: password
+      database: '*.*'
+      grants: PROCESS
+    - name: inspector
+      host: 127.0.0.1
+      password: password
+      databases:
+        - database: mydb
+          table: mytable
+          grant_option: True
+          grants:
+          - all privileges
diff --git a/tests/pillar/repo_galeracluster.sls b/tests/pillar/repo_galeracluster.sls
index a23ea1a..461b584 100644
--- a/tests/pillar/repo_galeracluster.sls
+++ b/tests/pillar/repo_galeracluster.sls
@@ -3,7 +3,7 @@
     enabled: true
     repo:
       galeracluster:
-        source: 'deb http://releases.galeracluster.com/galera-3/ubuntu {{ grains.get('oscodename') }} main'
+        source: 'deb http://releases.galeracluster.com/galera-{{ pillar.galera.version.galera }}/ubuntu {{ grains.get('oscodename') }} main'
         key_id: BC19DDBA
         key_server: hkp://p80.pool.sks-keyservers.net:80
         pin:
@@ -11,7 +11,7 @@
           priority: 1001
           package: '*'
       mysql-wsrep:
-        source: 'deb http://releases.galeracluster.com/mysql-wsrep-5.6/ubuntu {{ grains.get('oscodename') }} main'
+        source: 'deb http://releases.galeracluster.com/mysql-wsrep-{{ pillar.galera.version.mysql }}/ubuntu {{ grains.get('oscodename') }} main'
         key_id: BC19DDBA
         key_server: hkp://p80.pool.sks-keyservers.net:80
         pin: