diff --git a/src/tests/basictest.cpp b/src/tests/basictest.cpp
index 34530f0df0fd1c11876a533e06cdf78f64f6db6f..55e638fd3c83d473a73cc4920b416cc9176b335c 100644
--- a/src/tests/basictest.cpp
+++ b/src/tests/basictest.cpp
@@ -62,6 +62,9 @@ void BasicTest::setMeUp (void) {
 	userRegistration = new UserRegistration(component, userManager, storage);
 	userRegistration->start();
 
+	itemsResponder = new DiscoItemsResponder(component);
+	itemsResponder->start();
+
 	payloadSerializers = new Swift::FullPayloadSerializerCollection();
 	payloadParserFactories = new Swift::FullPayloadParserFactoryCollection();
 
@@ -108,6 +111,7 @@ void BasicTest::tearMeDown (void) {
 	delete parser;
 	delete storage;
 	delete userRegistration;
+	delete itemsResponder;
 	received.clear();
 	receivedData.clear();
 }
diff --git a/src/tests/basictest.h b/src/tests/basictest.h
index d9a36fd660db1f6275178494003afd4d1f8fc873..64202f8d547f235ab91d857806a1ccd4e5ff7e80 100644
--- a/src/tests/basictest.h
+++ b/src/tests/basictest.h
@@ -33,6 +33,7 @@
 #include "transport/conversation.h"
 #include "transport/usermanager.h"
 #include "transport/userregistration.h"
+#include "transport/discoitemsresponder.h"
 #include "transport/localbuddy.h"
 #include "transport/storagebackend.h"
 
@@ -217,5 +218,6 @@ class BasicTest : public Swift::XMPPParserClient {
 		std::string receivedData;
 		StorageBackend *storage;
 		UserRegistration *userRegistration;
+		DiscoItemsResponder *itemsResponder;
 };