diff --git a/linkcheck/dns/tests/test_flags.py b/linkcheck/dns/tests/test_flags.py
index ed4ac0c8..9a4107ee 100644
--- a/linkcheck/dns/tests/test_flags.py
+++ b/linkcheck/dns/tests/test_flags.py
@@ -59,9 +59,7 @@ class TestFlags (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestFlags))
-    return suite
+    return unittest.makeSuite(TestFlags)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_message.py b/linkcheck/dns/tests/test_message.py
index 7560ab06..52b00a2e 100644
--- a/linkcheck/dns/tests/test_message.py
+++ b/linkcheck/dns/tests/test_message.py
@@ -151,9 +151,7 @@ class TestMessage (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestMessage))
-    return suite
+    return unittest.makeSuite(TestMessage)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_name.py b/linkcheck/dns/tests/test_name.py
index cd3d6173..ddfa1057 100644
--- a/linkcheck/dns/tests/test_name.py
+++ b/linkcheck/dns/tests/test_name.py
@@ -593,10 +593,9 @@ class TestName (unittest.TestCase):
             (n, cused) = linkcheck.dns.name.from_wire(w, 0)
         self.assertRaises(linkcheck.dns.name.BadLabelType, bad)
 
+
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestName))
-    return suite
+    return unittest.makeSuite(TestName)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_namedict.py b/linkcheck/dns/tests/test_namedict.py
index 09e7f289..68672573 100644
--- a/linkcheck/dns/tests/test_namedict.py
+++ b/linkcheck/dns/tests/test_namedict.py
@@ -101,9 +101,7 @@ class TestNameDict (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestNameDict))
-    return suite
+    return unittest.makeSuite(TestNameDict)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_ntoaaton.py b/linkcheck/dns/tests/test_ntoaaton.py
index 7afee16f..1970ddc6 100644
--- a/linkcheck/dns/tests/test_ntoaaton.py
+++ b/linkcheck/dns/tests/test_ntoaaton.py
@@ -155,9 +155,7 @@ class TestNtoAAtoN (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestNtoAAtoN))
-    return suite
+    return unittest.makeSuite(TestNtoAAtoN)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_rdtypeandclass.py b/linkcheck/dns/tests/test_rdtypeandclass.py
index 313076b1..12b34135 100644
--- a/linkcheck/dns/tests/test_rdtypeandclass.py
+++ b/linkcheck/dns/tests/test_rdtypeandclass.py
@@ -124,9 +124,7 @@ class TestRdTypeAndClass (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestRdTypeAndClass))
-    return suite
+    return unittest.makeSuite(TestRdTypeAndClass)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_resolver.py b/linkcheck/dns/tests/test_resolver.py
index 8f2c2f6c..77e61ab9 100644
--- a/linkcheck/dns/tests/test_resolver.py
+++ b/linkcheck/dns/tests/test_resolver.py
@@ -80,9 +80,7 @@ class TestResolver (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestResolver))
-    return suite
+    return unittest.makeSuite(TestResolver)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_rrset.py b/linkcheck/dns/tests/test_rrset.py
index 999fb027..05ec8fb2 100644
--- a/linkcheck/dns/tests/test_rrset.py
+++ b/linkcheck/dns/tests/test_rrset.py
@@ -53,9 +53,7 @@ class TestRRset (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestRRset))
-    return suite
+    return unittest.makeSuite(TestRRset)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_set.py b/linkcheck/dns/tests/test_set.py
index d549f208..29a911ae 100644
--- a/linkcheck/dns/tests/test_set.py
+++ b/linkcheck/dns/tests/test_set.py
@@ -170,13 +170,6 @@ class TestSet(unittest.TestCase):
         s1.update(u)
         self.failUnless(s1 == e)
 
-
-def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestSet))
-    return suite
-
-
     def testGetitem(self):
         s1 = S([1, 2, 3])
         i0 = s1[0]
@@ -209,5 +202,10 @@ def test_suite ():
         i1 = s1[0]
         self.failUnless(i1 == 1 or i1 == 2 or i1 == 3)
 
+
+def test_suite ():
+    return unittest.makeSuite(TestSet)
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/dns/tests/test_tokenizer.py b/linkcheck/dns/tests/test_tokenizer.py
index 580fa2a0..4e83f101 100644
--- a/linkcheck/dns/tests/test_tokenizer.py
+++ b/linkcheck/dns/tests/test_tokenizer.py
@@ -175,9 +175,7 @@ class TestTokenizer (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestTokenizer))
-    return suite
+    return unittest.makeSuite(TestTokenizer)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_update.py b/linkcheck/dns/tests/test_update.py
index 1876df35..8a1dd848 100644
--- a/linkcheck/dns/tests/test_update.py
+++ b/linkcheck/dns/tests/test_update.py
@@ -113,9 +113,7 @@ class TestUpdate (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestUpdate))
-    return suite
+    return unittest.makeSuite(TestUpdate)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/dns/tests/test_zone.py b/linkcheck/dns/tests/test_zone.py
index 2ad82150..646a58f3 100644
--- a/linkcheck/dns/tests/test_zone.py
+++ b/linkcheck/dns/tests/test_zone.py
@@ -356,9 +356,7 @@ class TestZone (unittest.TestCase):
 
 
 def test_suite ():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestZone))
-    return suite
+    return unittest.makeSuite(TestZone)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_anchor.py b/linkcheck/ftests/test_anchor.py
index a95849df..64c09693 100644
--- a/linkcheck/ftests/test_anchor.py
+++ b/linkcheck/ftests/test_anchor.py
@@ -39,9 +39,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestAnchor))
-    return suite
+    return unittest.makeSuite(TestAnchor)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/ftests/test_base.py b/linkcheck/ftests/test_base.py
index 819d373b..8660070b 100644
--- a/linkcheck/ftests/test_base.py
+++ b/linkcheck/ftests/test_base.py
@@ -56,9 +56,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestBase))
-    return suite
+    return unittest.makeSuite(TestBase)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/ftests/test_error.py b/linkcheck/ftests/test_error.py
index 684d9e2f..88f563aa 100644
--- a/linkcheck/ftests/test_error.py
+++ b/linkcheck/ftests/test_error.py
@@ -131,9 +131,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestError))
-    return suite
+    return unittest.makeSuite(TestError)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_fcgi.py b/linkcheck/ftests/test_fcgi.py
index 57b5628a..92f30f9b 100644
--- a/linkcheck/ftests/test_fcgi.py
+++ b/linkcheck/ftests/test_fcgi.py
@@ -74,9 +74,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestFcgi))
-    return suite
+    return unittest.makeSuite(TestFcgi)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_file.py b/linkcheck/ftests/test_file.py
index 740317b6..c736e517 100644
--- a/linkcheck/ftests/test_file.py
+++ b/linkcheck/ftests/test_file.py
@@ -110,9 +110,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestFile))
-    return suite
+    return unittest.makeSuite(TestFile)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_frames.py b/linkcheck/ftests/test_frames.py
index 769f9477..fd36b682 100644
--- a/linkcheck/ftests/test_frames.py
+++ b/linkcheck/ftests/test_frames.py
@@ -38,9 +38,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestFrames))
-    return suite
+    return unittest.makeSuite(TestFrames)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/ftests/test_ftp.py b/linkcheck/ftests/test_ftp.py
index 496febf5..dadadf42 100644
--- a/linkcheck/ftests/test_ftp.py
+++ b/linkcheck/ftests/test_ftp.py
@@ -122,9 +122,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestFtp))
-    return suite
+    return unittest.makeSuite(TestFtp)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_http.py b/linkcheck/ftests/test_http.py
index bce53263..1fbd6f04 100644
--- a/linkcheck/ftests/test_http.py
+++ b/linkcheck/ftests/test_http.py
@@ -132,9 +132,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestHttp))
-    return suite
+    return unittest.makeSuite(TestHttp)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_https.py b/linkcheck/ftests/test_https.py
index ca817fb2..c9edfb4e 100644
--- a/linkcheck/ftests/test_https.py
+++ b/linkcheck/ftests/test_https.py
@@ -47,9 +47,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestHttps))
-    return suite
+    return unittest.makeSuite(TestHttps)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_mail.py b/linkcheck/ftests/test_mail.py
index ae15b7aa..9a65803d 100644
--- a/linkcheck/ftests/test_mail.py
+++ b/linkcheck/ftests/test_mail.py
@@ -171,9 +171,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestMail))
-    return suite
+    return unittest.makeSuite(TestMail)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_misc.py b/linkcheck/ftests/test_misc.py
index 88ae3b96..dd108943 100644
--- a/linkcheck/ftests/test_misc.py
+++ b/linkcheck/ftests/test_misc.py
@@ -38,9 +38,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestMisc))
-    return suite
+    return unittest.makeSuite(TestMisc)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/ftests/test_news.py b/linkcheck/ftests/test_news.py
index c2aec1c7..4fbd370e 100644
--- a/linkcheck/ftests/test_news.py
+++ b/linkcheck/ftests/test_news.py
@@ -146,9 +146,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestNews))
-    return suite
+    return unittest.makeSuite(TestNews)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_robotstxt.py b/linkcheck/ftests/test_robotstxt.py
index 1988b329..08b787d8 100644
--- a/linkcheck/ftests/test_robotstxt.py
+++ b/linkcheck/ftests/test_robotstxt.py
@@ -39,9 +39,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestRobotsTxt))
-    return suite
+    return unittest.makeSuite(TestRobotsTxt)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/ftests/test_telnet.py b/linkcheck/ftests/test_telnet.py
index f0d145bc..6d3f4219 100644
--- a/linkcheck/ftests/test_telnet.py
+++ b/linkcheck/ftests/test_telnet.py
@@ -69,9 +69,7 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestTelnet))
-    return suite
+    return unittest.makeSuite(TestTelnet)
 
 
 if __name__ == '__main__':
diff --git a/linkcheck/tests/test_cgi.py b/linkcheck/tests/test_cgi.py
index 5ba34cf8..af3592c6 100644
--- a/linkcheck/tests/test_cgi.py
+++ b/linkcheck/tests/test_cgi.py
@@ -81,9 +81,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestCgi))
-    return suite
+    return unittest.makeSuite(TestCgi)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_filenames.py b/linkcheck/tests/test_filenames.py
index 282e42cd..71107149 100644
--- a/linkcheck/tests/test_filenames.py
+++ b/linkcheck/tests/test_filenames.py
@@ -42,9 +42,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestFilenames))
-    return suite
+    return unittest.makeSuite(TestFilenames)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_linkname.py b/linkcheck/tests/test_linkname.py
index 605e08e6..16ab70e8 100644
--- a/linkcheck/tests/test_linkname.py
+++ b/linkcheck/tests/test_linkname.py
@@ -66,9 +66,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestLinkname))
-    return suite
+    return unittest.makeSuite(TestLinkname)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_linkparser.py b/linkcheck/tests/test_linkparser.py
index 2ef0115c..b4c08d66 100644
--- a/linkcheck/tests/test_linkparser.py
+++ b/linkcheck/tests/test_linkparser.py
@@ -81,9 +81,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestLinkparser))
-    return suite
+    return unittest.makeSuite(TestLinkparser)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_parser.py b/linkcheck/tests/test_parser.py
index 883c26c6..23acafca 100644
--- a/linkcheck/tests/test_parser.py
+++ b/linkcheck/tests/test_parser.py
@@ -224,9 +224,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestParser))
-    return suite
+    return unittest.makeSuite(TestParser)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_robotparser.py b/linkcheck/tests/test_robotparser.py
index 5fe99443..01fb31db 100644
--- a/linkcheck/tests/test_robotparser.py
+++ b/linkcheck/tests/test_robotparser.py
@@ -103,9 +103,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestRobotParser))
-    return suite
+    return unittest.makeSuite(TestRobotParser)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_strformat.py b/linkcheck/tests/test_strformat.py
index b8bcf960..c6ca5a15 100644
--- a/linkcheck/tests/test_strformat.py
+++ b/linkcheck/tests/test_strformat.py
@@ -94,9 +94,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestStrFormat))
-    return suite
+    return unittest.makeSuite(TestStrFormat)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_url.py b/linkcheck/tests/test_url.py
index 2d9efd0c..d982c1ea 100644
--- a/linkcheck/tests/test_url.py
+++ b/linkcheck/tests/test_url.py
@@ -476,9 +476,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestUrl))
-    return suite
+    return unittest.makeSuite(TestUrl)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/linkcheck/tests/test_urlbuild.py b/linkcheck/tests/test_urlbuild.py
index bc86e656..69397322 100644
--- a/linkcheck/tests/test_urlbuild.py
+++ b/linkcheck/tests/test_urlbuild.py
@@ -54,9 +54,8 @@ def test_suite ():
     """
     Build and return a TestSuite.
     """
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestUrlBuild))
-    return suite
+    return unittest.makeSuite(TestUrlBuild)
+
 
 if __name__ == '__main__':
     unittest.main()