diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index 3ee9f1656..83a92e253 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -144,10 +144,12 @@ public class XMPPConnection {
     }
 
     /**
-     * Creates a new connection to the specified XMPP server on the given port using the specified SocketFactory.
+     * Creates a new connection to the specified XMPP server on the given port using the
+     * specified SocketFactory.<p>
      *
-     * <p>A custom SocketFactory allows fine-grained control of the actual connection to the XMPP server. A typical
-     * use for a custom SocketFactory is when connecting through a SOCKS proxy.
+     * A custom SocketFactory allows fine-grained control of the actual connection to the
+     * XMPP server. A typical use for a custom SocketFactory is when connecting through a
+     * SOCKS proxy.
      *
      * @param host the name of the XMPP server to connect to; e.g. <tt>jivesoftware.com</tt>.
      * @param port the port on the server that should be used; e.g. <tt>5222</tt>.
@@ -179,6 +181,15 @@ public class XMPPConnection {
         init();
     }
 
+    /**
+     * Package-private default constructor. This constructor is only intended
+     * for unit testing. Normal classes extending XMPPConnection should override
+     * one of the other constructors.
+     */
+    XMPPConnection() {
+
+    }
+
     /**
      * Returns the connection ID for this connection, which is the value set by the server
      * when opening a XMPP stream. If the server does not set a connection ID, this value