1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 90b0965582..d485bc7ede 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -36,6 +36,7 @@ def search_function(encoding):
         return (encode2, decode2, None, None)
     else:
         return None
+codecs.register(search_function)
 
 def duplicate_string(text):
     """
@@ -57,10 +58,6 @@ class UnicodeTest(string_tests.CommonTest,
 
     type2test = str
 
-    def setUp(self):
-        codecs.register(search_function)
-        self.addCleanup(codecs.unregister, search_function)
-
     def checkequalnofix(self, result, object, methodname, *args):
         method = getattr(object, methodname)
         realresult = method(*args)