diff --git a/test/org/jivesoftware/smack/LoginTest.java b/test/org/jivesoftware/smack/LoginTest.java
index f69a75592..68e5c66fb 100644
--- a/test/org/jivesoftware/smack/LoginTest.java
+++ b/test/org/jivesoftware/smack/LoginTest.java
@@ -56,7 +56,7 @@ public class LoginTest extends SmackTestCase {
     /**
      * Check that the server handles anonymous users correctly.
      */
-    public void testAnonymousLogin() {
+    public void testSASLAnonymousLogin() {
         try {
             XMPPConnection conn1 = new XMPPConnection(getHost(), getPort());
             XMPPConnection conn2 = new XMPPConnection(getHost(), getPort());
@@ -64,6 +64,49 @@ public class LoginTest extends SmackTestCase {
                 // Try to login anonymously
                 conn1.loginAnonymously();
                 conn2.loginAnonymously();
+
+                assertNotNull("Resource is null", StringUtils.parseResource(conn1.getUser()));
+                assertNotNull("Resource is null", StringUtils.parseResource(conn2.getUser()));
+
+                assertNotNull("Username is null", StringUtils.parseName(conn1.getUser()));
+                assertNotNull("Username is null", StringUtils.parseName(conn2.getUser()));
+            }
+            catch (XMPPException e) {
+                e.printStackTrace();
+                fail(e.getMessage());
+            }
+            // Close the connection
+            conn1.close();
+            conn2.close();
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Check that the server handles anonymous users correctly.
+     */
+    public void testNonSASLAnonymousLogin() {
+        try {
+            ConnectionConfiguration config = new ConnectionConfiguration(getHost(), getPort());
+            config.setSASLAuthenticationEnabled(false);
+            XMPPConnection conn1 = new XMPPConnection(config);
+
+            config = new ConnectionConfiguration(getHost(), getPort());
+            config.setSASLAuthenticationEnabled(false);
+            XMPPConnection conn2 = new XMPPConnection(config);
+            try {
+                // Try to login anonymously
+                conn1.loginAnonymously();
+                conn2.loginAnonymously();
+
+                assertNotNull("Resource is null", StringUtils.parseResource(conn1.getUser()));
+                assertNotNull("Resource is null", StringUtils.parseResource(conn2.getUser()));
+
+                assertNotNull("Username is null", StringUtils.parseName(conn1.getUser()));
+                assertNotNull("Username is null", StringUtils.parseName(conn2.getUser()));
             }
             catch (XMPPException e) {
                 e.printStackTrace();