diff --git a/pytests/test_can_merge_build.py b/pytests/test_can_merge_build.py
index e5ab1f66..3b094826 100644
--- a/pytests/test_can_merge_build.py
+++ b/pytests/test_can_merge_build.py
@@ -12,7 +12,7 @@
 from podman_compose import normalize_service
 
 
-class TestMergeBuild(unittest.TestCase):
+class TestCanMergeBuild(unittest.TestCase):
     @parameterized.expand([
         ({"test": "test"}, {"test": "test"}),
         ({"build": "."}, {"build": {"context": "."}}),
diff --git a/pytests/test_can_merge_cmd_ent.py b/pytests/test_can_merge_cmd_ent.py
index 59fe8a3a..6f50b9eb 100644
--- a/pytests/test_can_merge_cmd_ent.py
+++ b/pytests/test_can_merge_cmd_ent.py
@@ -15,7 +15,7 @@
 test_keys = ["command", "entrypoint"]
 
 
-class TestMergeBuild(unittest.TestCase):
+class TestCanMergeCmdEnt(unittest.TestCase):
     @parameterized.expand([
         ({"$$$": []}, {"$$$": []}),
         ({"$$$": ["sh"]}, {"$$$": ["sh"]}),
diff --git a/pytests/test_compose_exec_args.py b/pytests/test_compose_exec_args.py
index 93f3e4b2..1092bcd9 100644
--- a/pytests/test_compose_exec_args.py
+++ b/pytests/test_compose_exec_args.py
@@ -6,7 +6,7 @@
 from podman_compose import compose_exec_args
 
 
-class TestExecArgs(unittest.TestCase):
+class TestComposeExecArgs(unittest.TestCase):
     def test_minimal(self):
         cnt = get_minimal_container()
         args = get_minimal_args()
diff --git a/pytests/test_compose_run_update_container_from_args.py b/pytests/test_compose_run_update_container_from_args.py
index 6712bd11..2ce9b2f9 100644
--- a/pytests/test_compose_run_update_container_from_args.py
+++ b/pytests/test_compose_run_update_container_from_args.py
@@ -7,7 +7,7 @@
 from podman_compose import compose_run_update_container_from_args
 
 
-class TestRunArgs(unittest.TestCase):
+class TestComposeRunUpdateContainerFromArgs(unittest.TestCase):
     def test_minimal(self):
         cnt = get_minimal_container()
         compose = get_minimal_compose()
diff --git a/pytests/test_network_create_args.py b/pytests/test_get_network_create_args.py
similarity index 100%
rename from pytests/test_network_create_args.py
rename to pytests/test_get_network_create_args.py
diff --git a/pytests/test_normalize_final_build.py b/pytests/test_normalize_final_build.py
index 55a6fafb..508c8ec7 100644
--- a/pytests/test_normalize_final_build.py
+++ b/pytests/test_normalize_final_build.py
@@ -16,7 +16,7 @@
 cwd = os.path.abspath(".")
 
 
-class TestNormalizeFullBuild(unittest.TestCase):
+class TestNormalizeFinalBuild(unittest.TestCase):
     cases_simple_normalization = [
         ({"image": "test-image"}, {"image": "test-image"}),
         (