diff --git a/src/tests/usermanager.cpp b/src/tests/usermanager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bd559a545bdca9aa4350361df4148ba60314f7e7
--- /dev/null
+++ b/src/tests/usermanager.cpp
@@ -0,0 +1,166 @@
+#include "transport/userregistry.h"
+#include "transport/config.h"
+#include "transport/storagebackend.h"
+#include "transport/user.h"
+#include "transport/transport.h"
+#include "transport/conversation.h"
+#include "transport/usermanager.h"
+#include "transport/localbuddy.h"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <Swiften/Swiften.h>
+#include <Swiften/EventLoop/DummyEventLoop.h>
+#include <Swiften/Server/Server.h>
+#include <Swiften/Network/DummyNetworkFactories.h>
+#include <Swiften/Network/DummyConnectionServer.h>
+#include "Swiften/Server/ServerStanzaChannel.h"
+#include "Swiften/Server/ServerFromClientSession.h"
+#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
+
+using namespace Transport;
+
+class TestingConversation : public Conversation {
+	public:
+		TestingConversation(ConversationManager *conversationManager, const std::string &legacyName, bool muc = false) : Conversation(conversationManager, legacyName, muc) {
+		}
+
+		// Called when there's new message to legacy network from XMPP network
+		void sendMessage(boost::shared_ptr<Swift::Message> &message) {
+			
+		}
+};
+
+class TestingFactory : public Factory {
+	public:
+		TestingFactory() {
+		}
+
+		// Creates new conversation (NetworkConversation in this case)
+		Conversation *createConversation(ConversationManager *conversationManager, const std::string &legacyName) {
+			Conversation *nc = new TestingConversation(conversationManager, legacyName);
+			return nc;
+		}
+
+		// Creates new LocalBuddy
+		Buddy *createBuddy(RosterManager *rosterManager, const BuddyInfo &buddyInfo) {
+			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id);
+			buddy->setAlias(buddyInfo.alias);
+			buddy->setName(buddyInfo.legacyName);
+			buddy->setSubscription(buddyInfo.subscription);
+			buddy->setGroups(buddyInfo.groups);
+			buddy->setFlags((BuddyFlag) buddyInfo.flags);
+			if (buddyInfo.settings.find("icon_hash") != buddyInfo.settings.end())
+				buddy->setIconHash(buddyInfo.settings.find("icon_hash")->second.s);
+			return buddy;
+		}
+};
+
+class UserManagerTest : public CPPUNIT_NS :: TestFixture, public Swift::XMPPParserClient {
+	CPPUNIT_TEST_SUITE(UserManagerTest);
+	CPPUNIT_TEST(connectUser);
+	CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void setUp (void) {
+			std::istringstream ifs("service.server_mode = 1\n");
+			cfg = new Config();
+			cfg->load(ifs);
+
+			factory = new TestingFactory();
+
+			loop = new Swift::DummyEventLoop();
+			factories = new Swift::DummyNetworkFactories(loop);
+
+			userRegistry = new UserRegistry(cfg, factories);
+
+			component = new Component(loop, factories, cfg, factory, userRegistry);
+			component->start();
+
+			userManager = new UserManager(component, userRegistry);
+
+			payloadSerializers = new Swift::FullPayloadSerializerCollection();
+			payloadParserFactories = new Swift::FullPayloadParserFactoryCollection();
+			parser = new Swift::XMPPParser(this, payloadParserFactories, factories->getXMLParserFactory());
+
+			serverFromClientSession = boost::shared_ptr<Swift::ServerFromClientSession>(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(), 
+					payloadParserFactories, payloadSerializers, userRegistry, factories->getXMLParserFactory(), Swift::JID("user@localhost/resource")));
+			serverFromClientSession->startSession();
+
+			serverFromClientSession->onDataWritten.connect(boost::bind(&UserManagerTest::handleDataReceived, this, _1));
+
+			dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->addSession(serverFromClientSession);
+			parser->parse("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' to='localhost' version='1.0'>");
+			received.clear();
+			loop->processEvents();
+		}
+
+		void tearDown (void) {
+			dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->removeSession(serverFromClientSession);
+			delete component;
+			delete userRegistry;
+			delete factories;
+			delete factory;
+			delete loop;
+			delete cfg;
+			delete parser;
+			received.clear();
+		}
+
+	void handleDataReceived(const Swift::SafeByteArray &data) {
+		parser->parse(safeByteArrayToString(data));
+	}
+
+	void handleStreamStart(const Swift::ProtocolHeader&) {
+		
+	}
+
+	void handleElement(boost::shared_ptr<Swift::Element> element) {
+		received.push_back(element);
+	}
+
+	void handleStreamEnd() {
+		
+	}
+
+	void connectUser() {
+		CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount());
+		userRegistry->isValidUserPassword(Swift::JID("user@localhost/resource"), serverFromClientSession.get(), Swift::createSafeByteArray("password"));
+		loop->processEvents();
+		CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount());
+
+		User *user = userManager->getUser("user@localhost");
+		CPPUNIT_ASSERT(user);
+
+		UserInfo userInfo = user->getUserInfo();
+		CPPUNIT_ASSERT_EQUAL(std::string("password"), userInfo.password);
+		CPPUNIT_ASSERT(user->isReadyToConnect() == true);
+		CPPUNIT_ASSERT(user->isConnected() == false);
+
+		user->setConnected(true);
+		CPPUNIT_ASSERT(user->isConnected() == true);
+	}
+
+
+	Swift::Stanza *getStanza(boost::shared_ptr<Swift::Element> element) {
+		Swift::Stanza *stanza = dynamic_cast<Swift::Stanza *>(element.get());
+		CPPUNIT_ASSERT(stanza);
+		return stanza;
+	}
+
+	private:
+		UserManager *userManager;
+		boost::shared_ptr<Swift::ServerFromClientSession> serverFromClientSession;
+		Swift::FullPayloadSerializerCollection* payloadSerializers;
+		Swift::FullPayloadParserFactoryCollection* payloadParserFactories;
+		Swift::XMPPParser *parser;
+		UserRegistry *userRegistry;
+		Config *cfg;
+		Swift::Server *server;
+		Swift::DummyNetworkFactories *factories;
+		Swift::DummyEventLoop *loop;
+		TestingFactory *factory;
+		Component *component;
+		std::vector<boost::shared_ptr<Swift::Element> > received;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (UserManagerTest);