diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index d0ad978e72847c..227c912bc8c322 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -2380,17 +2380,18 @@ def test_with_reinit_reloaded(self):
         # Keep a reference around.
         basic = self.load(self.NAME)
 
-        for name in [
-            f'{self.NAME}_with_reinit',  # m_size == 0
-            f'{self.NAME}_with_state',  # m_size > 0
+        for name, has_state in [
+            (f'{self.NAME}_with_reinit', False),  # m_size == 0
+            (f'{self.NAME}_with_state', True),    # m_size > 0
         ]:
             self.add_module_cleanup(name)
-            with self.subTest(name):
+            with self.subTest(name=name, has_state=has_state):
                 loaded = self.load(name)
-                reloaded = self.re_load(name, loaded.module)
-
-                if name.endswith("_with_state"):
+                if has_state:
                     self.addCleanup(loaded.module._clear_module_state)
+
+                reloaded = self.re_load(name, loaded.module)
+                if has_state:
                     self.addCleanup(reloaded.module._clear_module_state)
 
                 self.check_common(loaded)