diff --git a/run_tests.py b/run_tests.py
index caabda4..fe7ff9a 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -22,6 +22,9 @@
 ##
 
 import coverage
+coverage.erase()
+coverage.start()
+
 import logging
 import unittest
 
@@ -32,6 +35,7 @@ sys.setdefaultencoding('utf8')
 del sys.setdefaultencoding
 
 import jcl.tests
+import jcl.jabber.tests
 
 def suite():
     return jcl.tests.suite()
@@ -41,19 +45,27 @@ if __name__ == '__main__':
     logger.addHandler(logging.StreamHandler())
     logger.setLevel(logging.CRITICAL)
     
-    coverage.erase()
-    coverage.start()
-
     unittest.main(defaultTest='suite')
 
-    coverage.stop()
-    coverage.analysis(jcl.jabber.component)
-    coverage.analysis(jcl.jabber.feeder)
-    coverage.analysis(jcl.lang)
-    coverage.analysis(jcl.model.account)
-
-    coverage.report([jcl.jabber.component,
-                     jcl.jabber.feeder,
-                     jcl.lang,
-                     jcl.model.account])
+coverage.stop()
+coverage.analysis(jcl.jabber)
+coverage.analysis(jcl.jabber.component)
+coverage.analysis(jcl.jabber.feeder)
+coverage.analysis(jcl.jabber.message)
+coverage.analysis(jcl.jabber.presence)
+coverage.analysis(jcl.jabber.disco)
+coverage.analysis(jcl.lang)
+coverage.analysis(jcl.runner)
+coverage.analysis(jcl.model)
+coverage.analysis(jcl.model.account)
 
+coverage.report([jcl.jabber,
+                 jcl.jabber.component,
+                 jcl.jabber.feeder,
+                 jcl.jabber.message,
+                 jcl.jabber.presence,
+                 jcl.jabber.disco,
+                 jcl.lang,
+                 jcl.runner,
+                 jcl.model,
+                 jcl.model.account])
diff --git a/src/jcl/jabber/disco.py b/src/jcl/jabber/disco.py
index fbde289..c3d0627 100644
--- a/src/jcl/jabber/disco.py
+++ b/src/jcl/jabber/disco.py
@@ -54,6 +54,8 @@ class RootDiscoGetInfoHandler(DiscoHandler):
         self.__logger.debug("root_disco_get_info")
         disco_info = DiscoInfo()
         disco_info.add_feature("jabber:iq:version")
+        disco_info.add_feature("http://jabber.org/protocol/disco#info")
+        disco_info.add_feature("http://jabber.org/protocol/disco#items")
         if not self.component.account_manager.has_multiple_account_type:
             disco_info.add_feature("jabber:iq:register")
         DiscoIdentity(disco_info, self.component.name,
diff --git a/src/jcl/jabber/tests/component.py b/src/jcl/jabber/tests/component.py
index cb2ed96..05487b8 100644
--- a/src/jcl/jabber/tests/component.py
+++ b/src/jcl/jabber/tests/component.py
@@ -29,6 +29,7 @@ import time
 import sys
 import os
 import re
+import logging
 
 from sqlobject import *
 from sqlobject.dbconnection import TheURIOpener