-

diff --git a/.kitchen.yml b/.kitchen.yml
index fa8d567..06e3c6a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -34,6 +34,27 @@ suites:
               xtrabackup: xtrabackup-password
               clustercheck: clustercheck-password
 
+  - name: default_0162
+    provisioner:
+      salt_install: apt
+      salt_version: 0.16.2
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - percona
+        percona.sls:
+          percona:
+            version: '5.5'
+            max_connections: 100
+            long_query_time: 2
+
+            passwords:
+              root: root-password
+              debian-sys-maint: debian-sys-maint-password
+              xtrabackup: xtrabackup-password
+              clustercheck: clustercheck-password
+
   - name: alt-wsrep-interface
     provisioner:
       pillars:
diff --git a/percona/common.sls b/percona/common.sls
index 38185ab..3cb7a26 100644
--- a/percona/common.sls
+++ b/percona/common.sls
@@ -81,9 +81,6 @@ mysql:
 ## Required Users and Grants
 {{ mysql_user("debian-sys-maint", "localhost", salt['pillar.get']('percona:passwords:debian-sys-maint', '')) }}
 
-{{ mysql_user("root", "localhost", salt['pillar.get']('percona:passwords:root', '')) }}
-{{ mysql_grant("root", "localhost", "*.*", grant_option=True) }}
-
 {{ mysql_user("xtrabackup", "localhost", salt['pillar.get']('percona:passwords:xtrabackup', '')) }}
 {{ mysql_grant("xtrabackup", "localhost", "*.*", grant='RELOAD, LOCK TABLES, REPLICATION CLIENT') }}
 
diff --git a/percona/init.sls b/percona/init.sls
index ab87e1c..0488512 100644
--- a/percona/init.sls
+++ b/percona/init.sls
@@ -23,10 +23,10 @@ percona-server:
     - set
     - name: {{ 'percona-xtradb-cluster-server-' + percona_version }}
     - data:
-        'percona-server-server/root_password':
+        'percona-xtradb-cluster-server/root_password':
           type: password
           value: {{ salt['pillar.get']('percona:passwords:root', '') }}
-        'percona-server-server/root_password_again':
+        'percona-xtradb-cluster-server/root_password_again':
           type: password
           value: {{ salt['pillar.get']('percona:passwords:root', '') }}
     - require:
diff --git a/test/integration/default/serverspec/percona_spec.rb b/test/integration/default/serverspec/percona_spec.rb
index 24b4761..d7b28a4 100644
--- a/test/integration/default/serverspec/percona_spec.rb
+++ b/test/integration/default/serverspec/percona_spec.rb
@@ -30,7 +30,7 @@ describe "Percona MySQL" do
     it { should be_directory }
     it { should be_owned_by 'mysql' }
     it { should be_grouped_into 'mysql' }
-    it { should be_mode 755 }
+    it { should be_mode 700 }
   end
 
 end