diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 1f365d561fa..5f509aa25bd 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -316,7 +316,7 @@ The :class:`PyZipFile` constructor takes the same parameters as the
 
       string.pyc                                # Top level name 
       test/__init__.pyc                         # Package directory 
-      test/testall.pyc                          # Module test.testall
+      test/test_support.pyc                          # Module test.test_support
       test/bogus/__init__.pyc                   # Subpackage directory 
       test/bogus/myfile.pyc                     # Submodule test.bogus.myfile
 
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 09333824bc4..c66ff73f240 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -126,6 +126,8 @@ class TestPy3KWarnings(unittest.TestCase):
 
 class TestStdlibRemovals(unittest.TestCase):
 
+    # test.testall not tested as it executes all unit tests as an
+    # import side-effect.
     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new')
 
     def check_removal(self, module_name):
diff --git a/Lib/test/testall.py b/Lib/test/testall.py
index 23493940c7b..5b5cf01e81f 100644
--- a/Lib/test/testall.py
+++ b/Lib/test/testall.py
@@ -1,4 +1,10 @@
 # Backward compatibility -- you should use regrtest instead of this module.
+from warnings import warnpy3k
+warnpy3k("the test.testall module has been removed in Python 3.0",
+            stacklevel=2)
+del warnpy3k
+
+
 import sys, regrtest
 sys.argv[1:] = ["-vv"]
 regrtest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
index 08d36c40dff..82af109a44e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,8 @@ Extension Modules
 Library
 -------
 
+- The test.testall module has been deprecated for removal in Python 3.0.
+
 - The new module has been deprecated for removal in Python 3.0.
 
 - The user module has been deprecated for removal in Python 3.0.