diff --git a/src/XMPPConnection.h b/src/XMPPConnection.h
index 8e806e3..8ec0210 100644
--- a/src/XMPPConnection.h
+++ b/src/XMPPConnection.h
@@ -31,6 +31,7 @@
 @class XMPPAuthenticator;
 
 @protocol XMPPConnectionDelegate
+@optional
 - (void)connectionWasClosed: (XMPPConnection*)conn;
 - (void)connection: (XMPPConnection*)conn
       didReceiveIQ: (XMPPIQ*)iq;
@@ -43,7 +44,8 @@
 /**
  * \brief A class which abstracts a connection to an XMPP service.
  */
-@interface XMPPConnection: OFObject <OFXMLElementBuilderDelegate>
+@interface XMPPConnection: OFObject <OFXMLParserDelegate,
+    OFXMLElementBuilderDelegate>
 {
 	OFTCPSocket *sock;
 	OFXMLParser *parser;
diff --git a/tests/test.m b/tests/test.m
index b8b0011..9558730 100644
--- a/tests/test.m
+++ b/tests/test.m
@@ -32,7 +32,7 @@
 #import "XMPPMessage.h"
 #import "XMPPPresence.h"
 
-@interface AppDelegate: OFObject <XMPPConnectionDelegate>
+@interface AppDelegate: OFObject <OFApplicationDelegate, XMPPConnectionDelegate>
 {
 	XMPPConnection *conn;
 }