diff --git a/Doc/library/copy_reg.rst b/Doc/library/copy_reg.rst
index 9b82a31bacc..407044c4bb2 100644
--- a/Doc/library/copy_reg.rst
+++ b/Doc/library/copy_reg.rst
@@ -5,6 +5,8 @@
 .. module:: copy_reg
    :synopsis: Register pickle support functions.
 
+.. note::
+    The :mod:`copy_reg` module has been renamed to `copyreg` in Python 3.0.
 
 .. index::
    module: pickle
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index ddf38ad797d..40f7b190455 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -183,7 +183,7 @@ class TestStdlibRemovals(unittest.TestCase):
 
 class TestStdlibRenames(unittest.TestCase):
 
-    renames = {}
+    renames = {'copy_reg': 'copyreg'}
 
     def check_rename(self, module_name, new_module_name):
         """Make sure that: