1 files changed, 6 insertions, 3 deletions
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
index ff9ab0a..0cb38c3 100644
--- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -32,22 +32,25 @@ class BoostConnectionTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testWrite_IPv6);
 #endif
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
+			eventLoop_ = new DummyEventLoop();
 			boostIOServiceThread_ = new BoostIOServiceThread();
 			boostIOService = boost::make_shared<boost::asio::io_service>();
-			eventLoop_ = new DummyEventLoop();
 			disconnected = false;
 			connectFinished = false;
 		}
 
 		void tearDown() {
-			delete eventLoop_;
 			delete boostIOServiceThread_;
+			while (eventLoop_->hasEvents()) {
+				eventLoop_->processEvents();
+			}
+			delete eventLoop_;
 		}
 
 		void testDestructor() {
 			{
 				BoostConnection::ref testling(BoostConnection::create(boostIOServiceThread_->getIOService(), eventLoop_));
 				testling->connect(HostAddressPort(HostAddress(address, 4), 5222));