diff --git a/src/tests/user.cpp b/src/tests/user.cpp
index 5755ad0d2ea68ce368a88e3d88dc03eb1bb2a91c..bbafedbb1d90e15f00b630ba55c83e70e1026777 100644
--- a/src/tests/user.cpp
+++ b/src/tests/user.cpp
@@ -28,6 +28,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST(handlePresenceJoinRoomTwoResources);
 	CPPUNIT_TEST(handlePresenceLeaveRoom);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResources);
+	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesOneDisconnects);
 	CPPUNIT_TEST(leaveJoinedRoom);
 	CPPUNIT_TEST(handleDisconnected);
 	CPPUNIT_TEST(handleDisconnectedReconnect);
@@ -253,6 +254,29 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
 	}
 
+	void handlePresenceLeaveRoomTwoResourcesOneDisconnects() {
+		handlePresenceJoinRoomTwoResources();
+		received.clear();
+		User *user = userManager->getUser("user@localhost");
+
+		// User is still connected from resource2, so he should not leave the room
+		Swift::Presence::ref response = Swift::Presence::create();
+		response->setTo("localhost/hanzz");
+		response->setFrom("user@localhost/resource");
+		response->setType(Swift::Presence::Unavailable);
+		injectPresence(response);
+		loop->processEvents();
+
+
+		CPPUNIT_ASSERT_EQUAL(std::string(""), room);
+		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
+		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
+
+		Conversation *conv = user->getConversationManager()->getConversation("#room");
+		CPPUNIT_ASSERT_EQUAL(1, (int) conv->getJIDs().size());
+		CPPUNIT_ASSERT_EQUAL(Swift::JID("user@localhost/resource2"), conv->getJIDs().front());
+	}
+
 	void leaveJoinedRoom() {
 		User *user = userManager->getUser("user@localhost");
 		handlePresenceJoinRoom();