diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 23edee69ed8..4182da3aae0 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2691,7 +2691,8 @@ class CTextIOWrapperTest(TextIOWrapperTest):
 
 class PyTextIOWrapperTest(TextIOWrapperTest):
     io = pyio
-    shutdown_error = "LookupError: unknown encoding: ascii"
+    #shutdown_error = "LookupError: unknown encoding: ascii"
+    shutdown_error = "TypeError: 'NoneType' object is not iterable"
 
 
 class IncrementalNewlineDecoderTest(unittest.TestCase):
diff --git a/Python/import.c b/Python/import.c
index 207dbced414..7972f8612f7 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -401,8 +401,6 @@ PyImport_Cleanup(void)
     PyObject *key, *value, *dict;
     PyInterpreterState *interp = PyThreadState_GET()->interp;
     PyObject *modules = interp->modules;
-    PyObject *builtins_mod = NULL;
-    PyObject *sys_mod = NULL;
     PyObject *weaklist = NULL;
     char **p;