diff --git a/broker/pom.xml b/broker/pom.xml
index 353f522a4..4e309c8e1 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -17,7 +17,7 @@
         <bintray.package>io.moquette.moquette-broker</bintray.package>
         <netty.version>4.1.53.Final</netty.version>
         <netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
-        <paho.version>1.2.0</paho.version>
+        <paho.version>1.2.5</paho.version>
         <h2.version>1.4.199</h2.version>
     </properties>
 
diff --git a/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLClientAuthTest.java b/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLClientAuthTest.java
index 78c9d7322..83e8792f2 100644
--- a/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLClientAuthTest.java
+++ b/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLClientAuthTest.java
@@ -53,16 +53,17 @@
 /**
  * Check that Moquette could also handle SSL with client authentication.
  *
- * This test verifies client's autentication on server, so the server certificate has to be imported into the
+ * This test verifies client's authentication on server, so the server certificate has to be imported into the
  * client's keystore and the client's certificate must be imported into server's keystore.
  *
  *  the first way is done by:
  *  <pre>
- *  keytool -genkeypair -alias testserver -keyalg RSA -validity 3650 -keysize 2048 -dname cn=moquette.io -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv
+ *  keytool -genkeypair -alias testserver -keyalg RSA -validity 3650 -keysize 2048 -dname cn=localhost -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv
  *  </pre>
  *  and
  *  <pre>
- *  keytool -exportcert -alias testserver -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv | keytool -importcert -trustcacerts -noprompt -alias testserver -keystore signedclientkeystore.jks -keypass passw0rd -storepass passw0rd
+ *  keytool -exportcert -alias testserver -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv | \
+ *  keytool -importcert -trustcacerts -noprompt -alias testserver -keystore signedclientkeystore.jks -keypass passw0rd -storepass passw0rd
  *  </pre>
  *
  *  to create the key in the client side:
@@ -72,7 +73,8 @@
  *
  *  to import the client's certificate into server:
  *  <pre>
- *  keytool -exportcert -alias signedtestclient -keystore signedclientkeystore.jks -keypass passw0rd -storepass passw0rd | keytool -importcert -trustcacerts -noprompt -alias signedtestclient -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv
+ *  keytool -exportcert -alias signedtestclient -keystore signedclientkeystore.jks -keypass passw0rd -storepass passw0rd | \
+ *  keytool -importcert -trustcacerts -noprompt -alias signedtestclient -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv
  *  </pre>
  *
  *  To verify that a client's certficate not imported into server, it's necessary to create a client's key:
diff --git a/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLTest.java b/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLTest.java
index a997339bc..c568e9926 100644
--- a/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLTest.java
+++ b/broker/src/test/java/io/moquette/integration/ServerIntegrationSSLTest.java
@@ -62,7 +62,7 @@
  *
  * Command executed to create the key on server's keystore:
  * <pre>
- * keytool -genkeypair -alias testserver -keyalg RSA -validity 3650 -keysize 2048 -dname cn=moquette.io -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv
+ * keytool -genkeypair -alias testserver -keyalg RSA -validity 3650 -keysize 2048 -dname cn=localhost -keystore serverkeystore.jks -keypass passw0rdsrv -storepass passw0rdsrv
  * </pre>
  *
  * Command executed to export the certificate from the server's keystore and import directly in client's keystore:
diff --git a/broker/src/test/resources/clientkeystore.jks b/broker/src/test/resources/clientkeystore.jks
index 1fd1449fb..c7d51a2aa 100644
Binary files a/broker/src/test/resources/clientkeystore.jks and b/broker/src/test/resources/clientkeystore.jks differ
diff --git a/broker/src/test/resources/serverkeystore.jks b/broker/src/test/resources/serverkeystore.jks
index e18ef4343..60f33f0a4 100644
Binary files a/broker/src/test/resources/serverkeystore.jks and b/broker/src/test/resources/serverkeystore.jks differ
diff --git a/broker/src/test/resources/signedclientkeystore.jks b/broker/src/test/resources/signedclientkeystore.jks
index 5db33a489..7f5588533 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/unsignedclientkeystore.jks b/broker/src/test/resources/unsignedclientkeystore.jks
index d18c91d57..b810f23d9 100644
Binary files a/broker/src/test/resources/unsignedclientkeystore.jks and b/broker/src/test/resources/unsignedclientkeystore.jks differ