diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 24f17fb4ac8..398243a7733 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -164,8 +164,8 @@ class SysModuleTest(unittest.TestCase):
         # can't check more than the type, as the user might have changed it
         self.assertTrue(isinstance(sys.getdefaultencoding(), str))
 
-    # testing sys.settrace() is done in test_trace.py
-    # testing sys.setprofile() is done in test_profile.py
+    # testing sys.settrace() is done in test_sys_settrace.py
+    # testing sys.setprofile() is done in test_sys_setprofile.py
 
     def test_setcheckinterval(self):
         self.assertRaises(TypeError, sys.setcheckinterval)
diff --git a/Lib/test/test_profilehooks.py b/Lib/test/test_sys_setprofile.py
similarity index 99%
rename from Lib/test/test_profilehooks.py
rename to Lib/test/test_sys_setprofile.py
index 296c997c53e..54267a07e92 100644
--- a/Lib/test/test_profilehooks.py
+++ b/Lib/test/test_sys_setprofile.py
@@ -12,7 +12,7 @@ class TestGetProfile(unittest.TestCase):
         sys.setprofile(None)
 
     def test_empty(self):
-        assert sys.getprofile() == None
+        assert sys.getprofile() is None
 
     def test_setget(self):
         def fn(*args):
diff --git a/Lib/test/test_trace.py b/Lib/test/test_sys_settrace.py
similarity index 100%
rename from Lib/test/test_trace.py
rename to Lib/test/test_sys_settrace.py