diff --git a/tests/__init__.py b/tests/__init__.py
index 05d9f4e..05779c1 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -5,6 +5,8 @@ import errno
 import unittest
 import warnings
 
+from eventlet import debug, hubs
+
 # convenience for importers
 main = unittest.main
 
@@ -106,6 +108,15 @@ class LimitedTestCase(unittest.TestCase):
 
     def tearDown(self):
         self.timer.cancel()
+        try:
+            hub = hubs.get_hub()
+            num_readers = len(hub.get_readers())
+            num_writers = len(hub.get_writers())
+            assert num_readers == num_writers == 0
+        except AssertionError, e:
+            print "ERROR: Hub not empty"
+            print debug.format_hub_timers()
+            print debug.format_hub_listeners()
 
 
 def verify_hub_empty():
@@ -113,7 +124,7 @@ def verify_hub_empty():
     hub = hubs.get_hub()
     num_readers = len(hub.get_readers())
     num_writers = len(hub.get_writers())
-    num_timers = len(hub.get_timers_count())
+    num_timers = hub.get_timers_count()
     assert num_readers == 0 and num_writers == 0, "Readers: %s Writers: %s" % (num_readers, num_writers)