diff --git a/Lib/test/output/test_copy_reg b/Lib/test/output/test_copy_reg
new file mode 100644
index 00000000000..98518e8dbb9
--- /dev/null
+++ b/Lib/test/output/test_copy_reg
@@ -0,0 +1,9 @@
+test_copy_reg
+Caught expected TypeError:
+copy_reg is not intended for use with classes
+
+Caught expected TypeError:
+reduction functions must be callable
+
+Caught expected TypeError:
+constructors must be callable
diff --git a/Lib/test/test_copy_reg.py b/Lib/test/test_copy_reg.py
new file mode 100644
index 00000000000..0324d92dcae
--- /dev/null
+++ b/Lib/test/test_copy_reg.py
@@ -0,0 +1,35 @@
+import copy_reg
+
+class C:
+    pass
+
+
+try:
+    copy_reg.pickle(C, None, None)
+except TypeError, e:
+    print "Caught expected TypeError:"
+    print e
+else:
+    print "Failed to catch expected TypeError when registering a class type."
+
+
+print
+try:
+    copy_reg.pickle(type(1), "not a callable")
+except TypeError, e:
+    print "Caught expected TypeError:"
+    print e
+else:
+    print "Failed to catch TypeError " \
+          "when registering a non-callable reduction function."
+
+
+print
+try:
+    copy_reg.pickle(type(1), int, "not a callable")
+except TypeError, e:
+    print "Caught expected TypeError:"
+    print e
+else:
+    print "Failed to catch TypeError " \
+          "when registering a non-callable constructor."