diff --git a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java
new file mode 100644
index 000000000..16ee15a12
--- /dev/null
+++ b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java
@@ -0,0 +1,115 @@
+/**
+ *
+ * Copyright 2016 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.igniterealtime.smack.smackrepl;
+
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+
+import javax.net.ssl.SSLContext;
+
+import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
+import org.jivesoftware.smack.SmackException.SecurityRequiredByClientException;
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
+import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
+import org.jivesoftware.smack.util.StringUtils;
+import org.jxmpp.jid.EntityBareJid;
+import org.jxmpp.jid.impl.JidCreate;
+import org.jxmpp.stringprep.XmppStringprepException;
+
+import eu.geekplace.javapinning.java7.Java7Pinning;
+
+public class TlsTest {
+
+//    private static final Logger LOGGER = Logger.getLogger(TlsTest.class.getName());
+    public static boolean DEBUG = false;
+
+    public static void main(String[] args) throws XmppStringprepException, KeyManagementException, NoSuchAlgorithmException {
+        DEBUG = true;
+        tlsTest(args[0], args[1], args[2], args[3], args[4], args[5], true);
+    }
+
+    public static void tlsTest(String runsString, CharSequence jidCs, String password, String host, String portString,
+                    String tlsPin, boolean shouldThrow) throws XmppStringprepException, KeyManagementException, NoSuchAlgorithmException {
+        int runs = Integer.parseInt(runsString);
+        int port = Integer.parseInt(portString);
+        tlsTest(runs, jidCs, password, host, port, tlsPin, shouldThrow);
+    }
+
+    public static void tlsTest(int runs, CharSequence jidCs, String password, String host, int port,
+                    String tlsPin, boolean shouldThrow) throws XmppStringprepException, KeyManagementException, NoSuchAlgorithmException {
+        EntityBareJid jid = JidCreate.entityBareFrom(jidCs);
+        for (int i = 0; i < runs; i++) {
+            boolean res = tlsTest(jid, password, host, port, tlsPin, shouldThrow);
+            if (!res) {
+                throw new IllegalStateException();
+            }
+        }
+    }
+
+    public static boolean tlsTest(CharSequence jidCs, String password, String host, int port,
+                    String tlsPin, boolean shouldThrow) throws XmppStringprepException, KeyManagementException, NoSuchAlgorithmException {
+        EntityBareJid jid = JidCreate.entityBareFrom(jidCs);
+        return tlsTest(jid, password, host, port, tlsPin, shouldThrow);
+    }
+
+    public static boolean tlsTest(EntityBareJid jid, String password, String host, int port,
+                    String tlsPin, boolean shouldThrow) throws KeyManagementException, NoSuchAlgorithmException {
+        XMPPTCPConnectionConfiguration.Builder builder = XMPPTCPConnectionConfiguration.builder();
+        // @formatter:off
+        builder.setUsernameAndPassword(jid.getLocalpart(), password)
+               .setXmppDomain(JidCreate.domainBareFrom(jid.getDomain()))
+               .setHost(host)
+               .setPort(port)
+               .setSecurityMode(SecurityMode.required);
+        // @formatter:on
+        builder.setDebuggerEnabled(DEBUG);
+
+        if (StringUtils.isNotEmpty(tlsPin)) {
+            SSLContext sslContext = Java7Pinning.forPin(tlsPin);
+            builder.setCustomSSLContext(sslContext);
+        }
+
+
+        XMPPTCPConnection connection = new XMPPTCPConnection(builder.build());
+
+        connection.setPacketReplyTimeout(20000);
+
+        try {
+            connection.connect().login();
+            if (shouldThrow) {
+                // Test not success, should have throwed on login().
+                return false;
+            }
+        }
+        catch (SecurityRequiredByClientException e) {
+            if (!shouldThrow) {
+                return false;
+            }
+        }
+        catch (XMPPException | SmackException | IOException | InterruptedException e) {
+            throw new IllegalStateException(e);
+        }
+        finally {
+            connection.disconnect();
+        }
+
+        return true;
+    }
+}