diff --git a/lib/python/Products/ZCTextIndex/tests/testQueryParser.py b/lib/python/Products/ZCTextIndex/tests/testQueryParser.py
index b3b573f5a08feb1c15c27ba6bd538f67f9c86e85..dab9cec521bffc6b639dc98d57cc9d8a68ebecc1 100644
--- a/lib/python/Products/ZCTextIndex/tests/testQueryParser.py
+++ b/lib/python/Products/ZCTextIndex/tests/testQueryParser.py
@@ -14,7 +14,7 @@
 
 from unittest import TestCase, TestSuite, main, makeSuite
 
-##from Interface import verify_class_implementation
+from Interface.Verify import verifyClass
 
 from Products.ZCTextIndex.IQueryParser import IQueryParser
 from Products.ZCTextIndex.IQueryParseTree import IQueryParseTree
@@ -29,14 +29,14 @@ from Products.ZCTextIndex.Lexicon import Lexicon, Splitter
 class TestInterfaces(TestCase):
 
     def testInterfaces(self):
-        verify_class_implementation(IQueryParser, QueryParser)
-        verify_class_implementation(IQueryParseTree, ParseTreeNode)
-        verify_class_implementation(IQueryParseTree, OrNode)
-        verify_class_implementation(IQueryParseTree, AndNode)
-        verify_class_implementation(IQueryParseTree, NotNode)
-        verify_class_implementation(IQueryParseTree, AtomNode)
-        verify_class_implementation(IQueryParseTree, PhraseNode)
-        verify_class_implementation(IQueryParseTree, GlobNode)
+        verifyClass(IQueryParser, QueryParser)
+        verifyClass(IQueryParseTree, ParseTreeNode)
+        verifyClass(IQueryParseTree, OrNode)
+        verifyClass(IQueryParseTree, AndNode)
+        verifyClass(IQueryParseTree, NotNode)
+        verifyClass(IQueryParseTree, AtomNode)
+        verifyClass(IQueryParseTree, PhraseNode)
+        verifyClass(IQueryParseTree, GlobNode)
 
 
 class TestQueryParserBase(TestCase):
@@ -289,7 +289,7 @@ class FakeStopWordRemover:
 def test_suite():
     return TestSuite((makeSuite(TestQueryParser),
                       makeSuite(StopWordTestQueryParser),
-##                      makeSuite(TestInterfaces),
+                      makeSuite(TestInterfaces),
                     ))
 
 
diff --git a/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py b/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py
index a8fe136d64d0655812d1b625192fe32dbefcf31f..fe3f197e665bde21265a412b0ab874c7358fbb20 100644
--- a/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py
+++ b/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-##from Interface import verify_class_implementation
+from Interface.Verify import verifyClass
 
 from Products.PluginIndexes.common.PluggableIndex import \
      PluggableIndexInterface
@@ -188,8 +188,8 @@ class CosineIndexTests(ZCIndexTestsBase, testIndex.CosineIndexTest):
     # Gigabytes, pp. 180-188.  This test peeks into many internals of the
     # cosine indexer.
 
-##    def testInterface(self):
-##        verify_class_implementation(PluggableIndexInterface, ZCTextIndex)
+    def testInterface(self):
+        verifyClass(PluggableIndexInterface, ZCTextIndex)
 
     def testRanking(self):
         self.words = ["cold", "days", "eat", "hot", "lot", "nine", "old",