diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py
index d5d8c1a179e..f0753cf3856 100644
--- a/Lib/test/test_heapq.py
+++ b/Lib/test/test_heapq.py
@@ -305,8 +305,6 @@ def L(seqn):
     return chain(imap(lambda x:x, R(Ig(G(seqn)))))
 
 class TestErrorHandling(unittest.TestCase):
-    # only for C implementation
-    module = c_heapq
 
     def test_non_sequence(self):
         for f in (self.module.heapify, self.module.heappop):
@@ -351,12 +349,19 @@ class TestErrorHandling(unittest.TestCase):
                 self.assertRaises(TypeError, f, 2, N(s))
                 self.assertRaises(ZeroDivisionError, f, 2, E(s))
 
+class TestErrorHandling_Python(unittest.TestCase):
+    module = py_heapq
+
+class TestErrorHandling_C(TestErrorHandling):
+    module = c_heapq
+
 
 #==============================================================================
 
 
 def test_main(verbose=None):
-    test_classes = [TestHeapPython, TestHeapC, TestErrorHandling]
+    test_classes = [TestHeapPython, TestHeapC, TestErrorHandling_Python,
+                    TestErrorHandling_C]
     test_support.run_unittest(*test_classes)
 
     # verify reference counting