diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index d8f2d51b206..6eac67e9900 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -213,7 +213,8 @@ class ImportTest(unittest.TestCase):
             os.remove(source)
             del sys.modules[TESTFN]
             mod = __import__(TESTFN)
-            self.failUnless(mod.__file__.endswith('.pyc'))
+            ext = mod.__file__[-4:]
+            self.failUnless(ext in ('.pyc', '.pyo'), ext)
         finally:
             sys.path.pop(0)
             remove_files(TESTFN)
diff --git a/Python/import.c b/Python/import.c
index f9d4246a2bd..cce854fc7c2 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -982,7 +982,8 @@ get_sourcefile(const char *file)
 	}
 
 	len = strlen(file);
-	if (len > MAXPATHLEN || PyOS_stricmp(&file[len-4], ".pyc") != 0) {
+        /* match '*.py?' */
+	if (len > MAXPATHLEN || PyOS_strnicmp(&file[len-4], ".py", 3) != 0) {
 		return PyUnicode_DecodeFSDefault(file);
 	}