Fix test suites.

lib/python/Products/Five/formlib/tests/test_formlib.py

@@ -22,10 +22,10 @@ if __name__ == '__main__':
 def test_suite():
     import unittest
     from Testing.ZopeTestCase import FunctionalDocFileSuite
-    return unittest.TestSuite(
+    return unittest.TestSuite((
         FunctionalDocFileSuite(
-            'formlib.txt', package='Products.Five.formlib.tests')
-        )
+            'formlib.txt', package='Products.Five.formlib.tests'),
+        ))
 
 if __name__ == '__main__':
     framework()

lib/python/Products/Five/tests/test_registerpackage.py

@@ -77,10 +77,9 @@ def test_registerPackage():
 
 
 def test_suite():
-    from zope.testing.doctest import DocTestSuite
-    return DocTestSuite()
-    #from Testing.ZopeTestCase import ZopeDocTestSuite
-    #return ZopeDocTestSuite()
+    # Must use functional because registerPackage commits
+    from Testing.ZopeTestCase import FunctionalDocTestSuite
+    return FunctionalDocTestSuite()
 
 if __name__ == '__main__':
     framework()