diff --git a/src/python/pants/backend/python/subsystems/test_pex_build_util.py b/src/python/pants/backend/python/subsystems/pex_build_util_test.py
similarity index 100%
rename from src/python/pants/backend/python/subsystems/test_pex_build_util.py
rename to src/python/pants/backend/python/subsystems/pex_build_util_test.py
diff --git a/src/python/pants/base/test_specs.py b/src/python/pants/base/specs_test.py
similarity index 100%
rename from src/python/pants/base/test_specs.py
rename to src/python/pants/base/specs_test.py
diff --git a/src/python/pants/fs/test_fs.py b/src/python/pants/fs/fs_test.py
similarity index 100%
rename from src/python/pants/fs/test_fs.py
rename to src/python/pants/fs/fs_test.py
diff --git a/src/python/pants/help/test_list_goals_integration.py b/src/python/pants/help/list_goals_integration_test.py
similarity index 100%
rename from src/python/pants/help/test_list_goals_integration.py
rename to src/python/pants/help/list_goals_integration_test.py
diff --git a/src/python/pants/rules/core/test_cloc.py b/src/python/pants/rules/core/cloc_test.py
similarity index 100%
rename from src/python/pants/rules/core/test_cloc.py
rename to src/python/pants/rules/core/cloc_test.py