diff --git a/src/bin/bind10/tests/args_test.py b/src/bin/bind10/tests/args_test.py
index 70a5e2d84e..93a7cea32a 100644
--- a/src/bin/bind10/tests/args_test.py
+++ b/src/bin/bind10/tests/args_test.py
@@ -154,4 +154,4 @@ class TestBossArgs(unittest.TestCase):
         bob.wait()
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index ffdfd0538f..84a9da968d 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -1467,4 +1467,4 @@ if __name__ == '__main__':
     # store os.environ for test_unchanged_environment
     original_os_environ = copy.deepcopy(os.environ)
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/bindctl/tests/bindctl_test.py b/src/bin/bindctl/tests/bindctl_test.py
index f547195c4d..31a6bdaa2e 100644
--- a/src/bin/bindctl/tests/bindctl_test.py
+++ b/src/bin/bindctl/tests/bindctl_test.py
@@ -470,5 +470,5 @@ class TestCommandLineOptions(unittest.TestCase):
                           ['--csv-file-dir'])
 
 if __name__== "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
 
diff --git a/src/bin/bindctl/tests/cmdparse_test.py b/src/bin/bindctl/tests/cmdparse_test.py
index 6bed14b506..9150ed3250 100644
--- a/src/bin/bindctl/tests/cmdparse_test.py
+++ b/src/bin/bindctl/tests/cmdparse_test.py
@@ -84,5 +84,5 @@ class TestCmdParse(unittest.TestCase):
         
 
 if __name__== "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
     
diff --git a/src/bin/cfgmgr/plugins/tests/logging_test.py b/src/bin/cfgmgr/plugins/tests/logging_test.py
index b6bf02cbce..818a5964a7 100644
--- a/src/bin/cfgmgr/plugins/tests/logging_test.py
+++ b/src/bin/cfgmgr/plugins/tests/logging_test.py
@@ -132,4 +132,4 @@ class LoggingConfCheckTest(unittest.TestCase):
                                             'severity': 123}]}))
 
 if __name__ == '__main__':
-        unittest.main(verbosity=2)
+        unittest.main()
diff --git a/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py b/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py
index a7f228a82d..808f28a174 100644
--- a/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py
+++ b/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py
@@ -100,4 +100,4 @@ class TSigKeysTest(unittest.TestCase):
         self.assertNotEqual(None, tsig_keys.check({'keys': {}}))
 
 if __name__ == '__main__':
-        unittest.main(verbosity=2)
+        unittest.main()
diff --git a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
index 4b84f1fa3c..ca91c9c79f 100644
--- a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
+++ b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
@@ -201,5 +201,5 @@ class TestParseArgs(unittest.TestCase):
         
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
 
diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index 83eff27c67..5fdabb4852 100644
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -483,6 +483,6 @@ class TestFuncNotInClass(unittest.TestCase):
 
 if __name__== "__main__":
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
 
 
diff --git a/src/bin/ddns/tests/ddns_test.py b/src/bin/ddns/tests/ddns_test.py
index 19f0ab3f4c..395aacc512 100755
--- a/src/bin/ddns/tests/ddns_test.py
+++ b/src/bin/ddns/tests/ddns_test.py
@@ -416,4 +416,4 @@ class TestMain(unittest.TestCase):
 
 if __name__== "__main__":
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/dhcp6/tests/dhcp6_test.py b/src/bin/dhcp6/tests/dhcp6_test.py
index 77588bb84b..d63e04d7f0 100644
--- a/src/bin/dhcp6/tests/dhcp6_test.py
+++ b/src/bin/dhcp6/tests/dhcp6_test.py
@@ -68,4 +68,4 @@ class TestDhcpv6Daemon(unittest.TestCase):
             print("Ignoring failed kill attempt. Process is dead already.")
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/msgq/tests/msgq_test.py b/src/bin/msgq/tests/msgq_test.py
index 16f0d5fc69..fe4f7d4666 100644
--- a/src/bin/msgq/tests/msgq_test.py
+++ b/src/bin/msgq/tests/msgq_test.py
@@ -234,4 +234,4 @@ class SendNonblock(unittest.TestCase):
         self.send_many(data)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py
index c1314eea1f..e74405a3c6 100644
--- a/src/bin/stats/tests/b10-stats-httpd_test.py
+++ b/src/bin/stats/tests/b10-stats-httpd_test.py
@@ -1326,4 +1326,4 @@ class TestStatsHttpd(unittest.TestCase):
             imp.reload(stats_httpd)
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py
index c098b4617b..5262b8a442 100644
--- a/src/bin/stats/tests/b10-stats_test.py
+++ b/src/bin/stats/tests/b10-stats_test.py
@@ -912,7 +912,7 @@ class TestOSEnv(unittest.TestCase):
         imp.reload(stats)
 
 def test_main():
-    unittest.main(verbosity=2)
+    unittest.main()
 
 if __name__ == "__main__":
     test_main()
diff --git a/src/bin/tests/process_rename_test.py.in b/src/bin/tests/process_rename_test.py.in
index 0f730c1801..f96c023841 100644
--- a/src/bin/tests/process_rename_test.py.in
+++ b/src/bin/tests/process_rename_test.py.in
@@ -61,4 +61,4 @@ class TestRename(unittest.TestCase):
                         self.__scan(d, script, fun)
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index 748125721d..a5c92ab01f 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -2848,6 +2848,6 @@ class TestXfrinTransferStats(unittest.TestCase):
 if __name__== "__main__":
     try:
         isc.log.resetUnitTestRootLogger()
-        unittest.main(verbosity=2)
+        unittest.main()
     except KeyboardInterrupt as e:
         print(e)
diff --git a/src/bin/xfrout/tests/xfrout_test.py.in b/src/bin/xfrout/tests/xfrout_test.py.in
index 5582facc07..b60535c49b 100644
--- a/src/bin/xfrout/tests/xfrout_test.py.in
+++ b/src/bin/xfrout/tests/xfrout_test.py.in
@@ -1472,4 +1472,4 @@ class TestXfroutServer(unittest.TestCase):
 
 if __name__== "__main__":
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/bin/zonemgr/tests/zonemgr_test.py b/src/bin/zonemgr/tests/zonemgr_test.py
index 152908e844..29924c81fb 100644
--- a/src/bin/zonemgr/tests/zonemgr_test.py
+++ b/src/bin/zonemgr/tests/zonemgr_test.py
@@ -696,4 +696,4 @@ class TestZonemgr(unittest.TestCase):
 
 if __name__== "__main__":
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/edns_python_test.py b/src/lib/dns/python/tests/edns_python_test.py
index 2c8c200e96..b249213d7a 100644
--- a/src/lib/dns/python/tests/edns_python_test.py
+++ b/src/lib/dns/python/tests/edns_python_test.py
@@ -174,4 +174,4 @@ class EDNSTest(unittest.TestCase):
                           self.rrttl_badver, self.opt_rdata)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/message_python_test.py b/src/lib/dns/python/tests/message_python_test.py
index fae5228cf7..86574fb815 100644
--- a/src/lib/dns/python/tests/message_python_test.py
+++ b/src/lib/dns/python/tests/message_python_test.py
@@ -624,4 +624,4 @@ test.example.com. 3600 IN A 192.0.2.2
                           self.p, "message_fromWire16.wire")
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/messagerenderer_python_test.py b/src/lib/dns/python/tests/messagerenderer_python_test.py
index 8048c5e49b..53624964bf 100644
--- a/src/lib/dns/python/tests/messagerenderer_python_test.py
+++ b/src/lib/dns/python/tests/messagerenderer_python_test.py
@@ -117,4 +117,4 @@ class MessageRendererTest(unittest.TestCase):
         self.assertRaises(TypeError, renderer.set_compress_mode, "wrong")
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/name_python_test.py b/src/lib/dns/python/tests/name_python_test.py
index 9d204996e3..5263412af7 100644
--- a/src/lib/dns/python/tests/name_python_test.py
+++ b/src/lib/dns/python/tests/name_python_test.py
@@ -219,4 +219,4 @@ class NameTest(unittest.TestCase):
         self.assertFalse(self.name2 >= self.name1)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/nsec3hash_python_test.py b/src/lib/dns/python/tests/nsec3hash_python_test.py
index f6fea1332e..1a247d03ef 100644
--- a/src/lib/dns/python/tests/nsec3hash_python_test.py
+++ b/src/lib/dns/python/tests/nsec3hash_python_test.py
@@ -125,4 +125,4 @@ class NSEC3HashTest(unittest.TestCase):
                           Rdata(RRType.A(), RRClass.IN(), "192.0.2.1"))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/opcode_python_test.py b/src/lib/dns/python/tests/opcode_python_test.py
index 52767ecc17..84f449fc90 100644
--- a/src/lib/dns/python/tests/opcode_python_test.py
+++ b/src/lib/dns/python/tests/opcode_python_test.py
@@ -109,4 +109,4 @@ class OpcodeTest(unittest.TestCase):
             self.assertEqual(TypeError, type(err))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/question_python_test.py b/src/lib/dns/python/tests/question_python_test.py
index ce13d70b8a..8c8c81580e 100644
--- a/src/lib/dns/python/tests/question_python_test.py
+++ b/src/lib/dns/python/tests/question_python_test.py
@@ -98,4 +98,4 @@ class QuestionTest(unittest.TestCase):
         self.assertEqual(0, renderer.get_length())
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/rcode_python_test.py b/src/lib/dns/python/tests/rcode_python_test.py
index 6be2f12645..77fed3a321 100644
--- a/src/lib/dns/python/tests/rcode_python_test.py
+++ b/src/lib/dns/python/tests/rcode_python_test.py
@@ -141,4 +141,4 @@ class RcodeTest(unittest.TestCase):
             self.assertEqual(TypeError, type(err))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/rdata_python_test.py b/src/lib/dns/python/tests/rdata_python_test.py
index 86bec36f9e..81dea5f6dc 100644
--- a/src/lib/dns/python/tests/rdata_python_test.py
+++ b/src/lib/dns/python/tests/rdata_python_test.py
@@ -92,4 +92,4 @@ class RdataTest(unittest.TestCase):
         
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/rrclass_python_test.py b/src/lib/dns/python/tests/rrclass_python_test.py
index ca016b4a1a..38d8c8c34d 100644
--- a/src/lib/dns/python/tests/rrclass_python_test.py
+++ b/src/lib/dns/python/tests/rrclass_python_test.py
@@ -86,4 +86,4 @@ class RRClassTest(unittest.TestCase):
         self.assertEqual(255, RRClass.ANY().get_code())
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/rrset_python_test.py b/src/lib/dns/python/tests/rrset_python_test.py
index a0c8603816..de475a766d 100644
--- a/src/lib/dns/python/tests/rrset_python_test.py
+++ b/src/lib/dns/python/tests/rrset_python_test.py
@@ -119,4 +119,4 @@ class TestModuleSpec(unittest.TestCase):
         self.assertEqual(1, sys.getrefcount(self.rrset_a.get_rdata()[0]))
         
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/rrttl_python_test.py b/src/lib/dns/python/tests/rrttl_python_test.py
index ab3568a596..aa4a34d5aa 100644
--- a/src/lib/dns/python/tests/rrttl_python_test.py
+++ b/src/lib/dns/python/tests/rrttl_python_test.py
@@ -80,4 +80,4 @@ class RRTTLTest(unittest.TestCase):
         self.assertTrue(self.t1 <= self.t2)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/rrtype_python_test.py b/src/lib/dns/python/tests/rrtype_python_test.py
index 5ef65155db..713542653a 100644
--- a/src/lib/dns/python/tests/rrtype_python_test.py
+++ b/src/lib/dns/python/tests/rrtype_python_test.py
@@ -141,4 +141,4 @@ class TestModuleSpec(unittest.TestCase):
         self.assertEqual(255, RRType.ANY().get_code())
         
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/serial_python_test.py b/src/lib/dns/python/tests/serial_python_test.py
index eacf489a32..0ca08c2ffd 100644
--- a/src/lib/dns/python/tests/serial_python_test.py
+++ b/src/lib/dns/python/tests/serial_python_test.py
@@ -108,4 +108,4 @@ class SerialTest(unittest.TestCase):
         self.assertRaises(TypeError, lambda: "bad" + self.zero)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/tsig_python_test.py b/src/lib/dns/python/tests/tsig_python_test.py
index d958049edc..7e5515de5d 100644
--- a/src/lib/dns/python/tests/tsig_python_test.py
+++ b/src/lib/dns/python/tests/tsig_python_test.py
@@ -551,4 +551,4 @@ class TSIGContextTest(unittest.TestCase):
                                 TSIGContext.STATE_RECEIVED_REQUEST)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/tsig_rdata_python_test.py b/src/lib/dns/python/tests/tsig_rdata_python_test.py
index fc33ad8189..7b861d6ca5 100644
--- a/src/lib/dns/python/tests/tsig_rdata_python_test.py
+++ b/src/lib/dns/python/tests/tsig_rdata_python_test.py
@@ -27,4 +27,4 @@ class TSIGRdataTest(unittest.TestCase):
         self.assertEqual(1, sys.getrefcount(tsig.get_algorithm()))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/tsigerror_python_test.py b/src/lib/dns/python/tests/tsigerror_python_test.py
index 65e0ea11ee..a968b6bcd5 100644
--- a/src/lib/dns/python/tests/tsigerror_python_test.py
+++ b/src/lib/dns/python/tests/tsigerror_python_test.py
@@ -94,4 +94,4 @@ class TSIGErrorTest(unittest.TestCase):
         self.assertEqual(1, sys.getrefcount(TSIGError.BAD_SIG.to_rcode()))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/tsigkey_python_test.py b/src/lib/dns/python/tests/tsigkey_python_test.py
index 01e88b0f64..516bea4e98 100644
--- a/src/lib/dns/python/tests/tsigkey_python_test.py
+++ b/src/lib/dns/python/tests/tsigkey_python_test.py
@@ -209,4 +209,4 @@ class TSIGKeyRingTest(unittest.TestCase):
                                            self.sha1_name))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/dns/python/tests/tsigrecord_python_test.py b/src/lib/dns/python/tests/tsigrecord_python_test.py
index 9839c29981..813a23b144 100644
--- a/src/lib/dns/python/tests/tsigrecord_python_test.py
+++ b/src/lib/dns/python/tests/tsigrecord_python_test.py
@@ -41,4 +41,4 @@ class TSIGRecordTest(unittest.TestCase):
         self.assertEqual(expected_text, str(self.test_record))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/acl/tests/acl_test.py b/src/lib/python/isc/acl/tests/acl_test.py
index 39b7e7b09b..24a0c94f25 100644
--- a/src/lib/python/isc/acl/tests/acl_test.py
+++ b/src/lib/python/isc/acl/tests/acl_test.py
@@ -26,4 +26,4 @@ class ACLTest(unittest.TestCase):
         self.assertTrue(DROP != ACCEPT)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/acl/tests/dns_test.py b/src/lib/python/isc/acl/tests/dns_test.py
index 9b05cd8db8..7ee3023454 100644
--- a/src/lib/python/isc/acl/tests/dns_test.py
+++ b/src/lib/python/isc/acl/tests/dns_test.py
@@ -354,4 +354,4 @@ class RequestLoaderTest(unittest.TestCase):
         self.assertRaises(Error, RequestLoader)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/bind10/tests/component_test.py b/src/lib/python/isc/bind10/tests/component_test.py
index 997ad78c8c..ec0e8af70d 100644
--- a/src/lib/python/isc/bind10/tests/component_test.py
+++ b/src/lib/python/isc/bind10/tests/component_test.py
@@ -1057,4 +1057,4 @@ class ConfiguratorTest(BossUtils, unittest.TestCase):
 if __name__ == '__main__':
     isc.log.init("bind10") # FIXME Should this be needed?
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/bind10/tests/sockcreator_test.py b/src/lib/python/isc/bind10/tests/sockcreator_test.py
index fb8547a4a7..d97d21b7e8 100644
--- a/src/lib/python/isc/bind10/tests/sockcreator_test.py
+++ b/src/lib/python/isc/bind10/tests/sockcreator_test.py
@@ -321,4 +321,4 @@ class WrapTests(unittest.TestCase):
 if __name__ == '__main__':
     isc.log.init("bind10") # FIXME Should this be needed?
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/bind10/tests/socket_cache_test.py b/src/lib/python/isc/bind10/tests/socket_cache_test.py
index 68f45af1af..bbbf776892 100644
--- a/src/lib/python/isc/bind10/tests/socket_cache_test.py
+++ b/src/lib/python/isc/bind10/tests/socket_cache_test.py
@@ -393,4 +393,4 @@ class SocketCacheTest(Test):
 if __name__ == '__main__':
     isc.log.init("bind10")
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/cc/tests/data_test.py b/src/lib/python/isc/cc/tests/data_test.py
index 0677d9c149..b8dc222188 100644
--- a/src/lib/python/isc/cc/tests/data_test.py
+++ b/src/lib/python/isc/cc/tests/data_test.py
@@ -239,6 +239,6 @@ if __name__ == '__main__':
     #if not 'CONFIG_TESTDATA_PATH' in os.environ:
     #    print("You need to set the environment variable CONFIG_TESTDATA_PATH to point to the directory containing the test data files")
     #    exit(1)
-    unittest.main(verbosity=2)
+    unittest.main()
 
 
diff --git a/src/lib/python/isc/cc/tests/message_test.py b/src/lib/python/isc/cc/tests/message_test.py
index 19b8d95cf8..c417068120 100644
--- a/src/lib/python/isc/cc/tests/message_test.py
+++ b/src/lib/python/isc/cc/tests/message_test.py
@@ -54,6 +54,6 @@ class MessageTest(unittest.TestCase):
         self.assertRaises(ValueError, isc.cc.message.from_wire, b']')
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
 
 
diff --git a/src/lib/python/isc/cc/tests/session_test.py b/src/lib/python/isc/cc/tests/session_test.py
index 2d3e98eb12..e589085189 100644
--- a/src/lib/python/isc/cc/tests/session_test.py
+++ b/src/lib/python/isc/cc/tests/session_test.py
@@ -409,5 +409,5 @@ class testSession(unittest.TestCase):
             os.remove(TEST_SOCKET_FILE)
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
 
diff --git a/src/lib/python/isc/cc/tests/test_session.py b/src/lib/python/isc/cc/tests/test_session.py
index 2997dd610f..3c4960f164 100644
--- a/src/lib/python/isc/cc/tests/test_session.py
+++ b/src/lib/python/isc/cc/tests/test_session.py
@@ -57,4 +57,4 @@ class TestCCWireEncoding(unittest.TestCase):
         self.assertEqual(env["instance"], "i4")
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/config/tests/ccsession_test.py b/src/lib/python/isc/config/tests/ccsession_test.py
index 26220755a8..d1060bf008 100644
--- a/src/lib/python/isc/config/tests/ccsession_test.py
+++ b/src/lib/python/isc/config/tests/ccsession_test.py
@@ -1108,5 +1108,5 @@ class TestUIModuleCCSession(unittest.TestCase):
 
 if __name__ == '__main__':
     isc.log.init("bind10")
-    unittest.main(verbosity=2)
+    unittest.main()
 
diff --git a/src/lib/python/isc/config/tests/cfgmgr_test.py b/src/lib/python/isc/config/tests/cfgmgr_test.py
index 13339d4444..891a7d7b67 100644
--- a/src/lib/python/isc/config/tests/cfgmgr_test.py
+++ b/src/lib/python/isc/config/tests/cfgmgr_test.py
@@ -626,4 +626,4 @@ if __name__ == '__main__':
         exit(1)
     isc.log.init("unittests")
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/config/tests/config_data_test.py b/src/lib/python/isc/config/tests/config_data_test.py
index 8c86e8c513..446d89898d 100644
--- a/src/lib/python/isc/config/tests/config_data_test.py
+++ b/src/lib/python/isc/config/tests/config_data_test.py
@@ -698,5 +698,5 @@ class TestMultiConfigData(unittest.TestCase):
                          ], config_items)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
 
diff --git a/src/lib/python/isc/config/tests/module_spec_test.py b/src/lib/python/isc/config/tests/module_spec_test.py
index f594a68450..fc53d23221 100644
--- a/src/lib/python/isc/config/tests/module_spec_test.py
+++ b/src/lib/python/isc/config/tests/module_spec_test.py
@@ -442,4 +442,4 @@ class TestModuleSpec(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/datasrc/tests/datasrc_test.py b/src/lib/python/isc/datasrc/tests/datasrc_test.py
index 531740357b..a6f8f1639b 100644
--- a/src/lib/python/isc/datasrc/tests/datasrc_test.py
+++ b/src/lib/python/isc/datasrc/tests/datasrc_test.py
@@ -893,4 +893,4 @@ class JournalRead(unittest.TestCase):
 if __name__ == "__main__":
     isc.log.init("bind10")
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/datasrc/tests/master_test.py b/src/lib/python/isc/datasrc/tests/master_test.py
index 011a4c2e2f..c65858ebc2 100644
--- a/src/lib/python/isc/datasrc/tests/master_test.py
+++ b/src/lib/python/isc/datasrc/tests/master_test.py
@@ -32,4 +32,4 @@ class TestTTL(unittest.TestCase):
         self.assertFalse(isttl('1X'))
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py b/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
index bc338c0339..10c61cf2a1 100644
--- a/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
+++ b/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
@@ -140,4 +140,4 @@ class NewDBFile(unittest.TestCase):
         con.close()
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/log/tests/log_test.py b/src/lib/python/isc/log/tests/log_test.py
index b948fc5bfc..13376549b4 100644
--- a/src/lib/python/isc/log/tests/log_test.py
+++ b/src/lib/python/isc/log/tests/log_test.py
@@ -201,4 +201,4 @@ class Logger(unittest.TestCase):
         self.assertRaises(ValueError, logger.info, self.TEST_MSG, LogParam())
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/net/tests/addr_test.py b/src/lib/python/isc/net/tests/addr_test.py
index eccf70ef1f..bee2118e7f 100644
--- a/src/lib/python/isc/net/tests/addr_test.py
+++ b/src/lib/python/isc/net/tests/addr_test.py
@@ -45,4 +45,4 @@ class TestIPAddr(unittest.TestCase):
         self.assertRaises(InvalidAddress, IPAddr, '')
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/net/tests/parse_test.py b/src/lib/python/isc/net/tests/parse_test.py
index 094ab71f36..ba97da6414 100644
--- a/src/lib/python/isc/net/tests/parse_test.py
+++ b/src/lib/python/isc/net/tests/parse_test.py
@@ -82,4 +82,4 @@ class TestCheckIP(unittest.TestCase):
         self.assertEqual("2001:bd8::", str(addr_parse("2001:bd8::0.0.0.0")))
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/notify/tests/notify_out_test.py b/src/lib/python/isc/notify/tests/notify_out_test.py
index 4d23e9a323..1b3a4a128d 100644
--- a/src/lib/python/isc/notify/tests/notify_out_test.py
+++ b/src/lib/python/isc/notify/tests/notify_out_test.py
@@ -417,4 +417,4 @@ class TestNotifyOut(unittest.TestCase):
 if __name__== "__main__":
     isc.log.init("bind10")
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/server_common/tests/tsig_keyring_test.py b/src/lib/python/isc/server_common/tests/tsig_keyring_test.py
index dbb8568e47..e9a217469c 100644
--- a/src/lib/python/isc/server_common/tests/tsig_keyring_test.py
+++ b/src/lib/python/isc/server_common/tests/tsig_keyring_test.py
@@ -190,4 +190,4 @@ class TSIGKeyRingTest(unittest.TestCase):
 if __name__ == "__main__":
     isc.log.init("bind10") # FIXME Should this be needed?
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/util/cio/tests/socketsession_test.py b/src/lib/python/isc/util/cio/tests/socketsession_test.py
index b1d7ba8f83..66b43d59e7 100644
--- a/src/lib/python/isc/util/cio/tests/socketsession_test.py
+++ b/src/lib/python/isc/util/cio/tests/socketsession_test.py
@@ -250,4 +250,4 @@ class TestReceiver(unittest.TestCase):
         self.assertRaises(TypeError, SocketSessionReceiver, FakeSocket())
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/util/tests/file_test.py b/src/lib/python/isc/util/tests/file_test.py
index 91bbb3e30d..fb765d7248 100644
--- a/src/lib/python/isc/util/tests/file_test.py
+++ b/src/lib/python/isc/util/tests/file_test.py
@@ -29,4 +29,4 @@ class FileTest(unittest.TestCase):
         self.assertRaises(IOError, isc.util.file.path_search, 'no file', ['/no/such/directory'])
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/util/tests/process_test.py b/src/lib/python/isc/util/tests/process_test.py
index d55f3f3b6c..5005aa0d01 100644
--- a/src/lib/python/isc/util/tests/process_test.py
+++ b/src/lib/python/isc/util/tests/process_test.py
@@ -36,4 +36,4 @@ class TestRename(unittest.TestCase):
         self.assertEqual("process_test.py", self.__get_self_name())
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
diff --git a/src/lib/python/isc/util/tests/socketserver_mixin_test.py b/src/lib/python/isc/util/tests/socketserver_mixin_test.py
index 08751cb152..a6686d8cf4 100644
--- a/src/lib/python/isc/util/tests/socketserver_mixin_test.py
+++ b/src/lib/python/isc/util/tests/socketserver_mixin_test.py
@@ -58,6 +58,6 @@ class TestNoPollMixIn(unittest.TestCase):
         self.assertTrue(server._is_shut_down.is_set())
 
 if __name__== "__main__":
-    unittest.main(verbosity=2)
+    unittest.main()
 
 
diff --git a/src/lib/python/isc/xfrin/tests/diff_tests.py b/src/lib/python/isc/xfrin/tests/diff_tests.py
index 165f9af2d5..7c1158af92 100644
--- a/src/lib/python/isc/xfrin/tests/diff_tests.py
+++ b/src/lib/python/isc/xfrin/tests/diff_tests.py
@@ -489,4 +489,4 @@ class DiffTest(unittest.TestCase):
 if __name__ == "__main__":
     isc.log.init("bind10")
     isc.log.resetUnitTestRootLogger()
-    unittest.main(verbosity=2)
+    unittest.main()