diff --git a/Lib/test/test_ipaddr.py b/Lib/test/test_ipaddr.py
index afa8da36de5..d117154a7e6 100755
--- a/Lib/test/test_ipaddr.py
+++ b/Lib/test/test_ipaddr.py
@@ -19,7 +19,7 @@
 
 
 import unittest
-
+from test import support
 import ipaddr
 
 
@@ -569,4 +569,5 @@ class IpaddrUnitTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    support.run_unittest(IpaddrUnitTest)
+    support.run_doctest(ipaddr, True)