diff --git a/broker/src/test/java/io/moquette/server/ServerIntegrationDBAuthenticatorTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationDBAuthenticatorTest.java
index d7884991..d27ebb33 100644
--- a/broker/src/test/java/io/moquette/server/ServerIntegrationDBAuthenticatorTest.java
+++ b/broker/src/test/java/io/moquette/server/ServerIntegrationDBAuthenticatorTest.java
@@ -48,7 +48,7 @@ public class ServerIntegrationDBAuthenticatorTest {
 
     protected void startServer() throws IOException {
         m_server = new Server();
-        final Properties configProps = addDBAuthenticatorConf(IntegrationUtils.prepareTestPropeties());
+        final Properties configProps = addDBAuthenticatorConf(IntegrationUtils.prepareTestProperties());
         m_config = new MemoryConfig(configProps);
         m_server.startServer(m_config);
     }
diff --git a/broker/src/test/java/io/moquette/server/ServerIntegrationSSLClientAuthTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationSSLClientAuthTest.java
index 3868d53b..79269d58 100644
--- a/broker/src/test/java/io/moquette/server/ServerIntegrationSSLClientAuthTest.java
+++ b/broker/src/test/java/io/moquette/server/ServerIntegrationSSLClientAuthTest.java
@@ -49,10 +49,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Check that Moquette could also handle SSL with client authentification.
+ * Check that Moquette could also handle SSL with client authentication.
  * 
  * <p>
- * Create certificates needed for client authentification
+ * Create certificates needed for client authentication
  * <pre>
  * # generate server certificate chain (valid for 10000 days)
  * keytool -genkeypair -alias signedtestserver -dname cn=moquette.eclipse.org -keyalg RSA -keysize 2048 -keystore signedserverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv -validity 10000 
@@ -152,8 +152,8 @@ public class ServerIntegrationSSLClientAuthTest {
     }
     
     @Test
-    public void checkClientAuthentification() throws Exception {
-        LOG.info("*** checkClientAuthentification ***");
+    public void checkClientAuthentication() throws Exception {
+        LOG.info("*** checkClientAuthentication ***");
         SSLSocketFactory ssf = configureSSLSocketFactory("signedclientkeystore.jks");
         
         MqttConnectOptions options = new MqttConnectOptions();
@@ -164,8 +164,8 @@ public class ServerIntegrationSSLClientAuthTest {
     }
 
     @Test (expected = MqttException.class)
-    public void checkClientAuthentificationFail() throws Exception {
-        LOG.info("*** checkClientAuthentificationFail ***");
+    public void checkClientAuthenticationFail() throws Exception {
+        LOG.info("*** checkClientAuthenticationFail ***");
         SSLSocketFactory ssf = configureSSLSocketFactory("unsignedclientkeystore.jks");
         
         MqttConnectOptions options = new MqttConnectOptions();
diff --git a/broker/src/test/resources/signedclientkeystore.jks b/broker/src/test/resources/signedclientkeystore.jks
index 42cc4037..4aa98375 100644
Binary files a/broker/src/test/resources/signedclientkeystore.jks and b/broker/src/test/resources/signedclientkeystore.jks differ
diff --git a/broker/src/test/resources/signedserverkeystore.jks b/broker/src/test/resources/signedserverkeystore.jks
index 6e238726..ce0afce1 100644
Binary files a/broker/src/test/resources/signedserverkeystore.jks and b/broker/src/test/resources/signedserverkeystore.jks differ
diff --git a/broker/src/test/resources/unsignedclientkeystore.jks b/broker/src/test/resources/unsignedclientkeystore.jks
index 3495c3ff..1e74944d 100644
Binary files a/broker/src/test/resources/unsignedclientkeystore.jks and b/broker/src/test/resources/unsignedclientkeystore.jks differ