diff --git a/scripts/find_duplicate_test_files.sh b/scripts/find_duplicate_test_files.sh
new file mode 100644
index 00000000..50089ba9
--- /dev/null
+++ b/scripts/find_duplicate_test_files.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+parent_dir=$(dirname "$0")/..
+test_dir="$parent_dir/test"
+
+# find all files in test_dir ending in .py
+# make sure the filenames are unique
+find "$test_dir" -type f -name "*.py" -exec basename {} \; | sort | uniq -d
diff --git a/test/core/test_util.py b/test/core/test_core_util.py
similarity index 100%
rename from test/core/test_util.py
rename to test/core/test_core_util.py
diff --git a/test/exporters/pcb/kicad/test_transformer.py b/test/exporters/pcb/kicad/test_pcb_transformer.py
similarity index 100%
rename from test/exporters/pcb/kicad/test_transformer.py
rename to test/exporters/pcb/kicad/test_pcb_transformer.py
diff --git a/test/exporters/schematic/kicad/test_transformer.py b/test/exporters/schematic/kicad/test_schematic_transformer.py
similarity index 100%
rename from test/exporters/schematic/kicad/test_transformer.py
rename to test/exporters/schematic/kicad/test_schematic_transformer.py
diff --git a/test/library/test_basic.py b/test/library/test_instance_library_modules.py
similarity index 98%
rename from test/library/test_basic.py
rename to test/library/test_instance_library_modules.py
index fb071af1..dc5415ed 100644
--- a/test/library/test_basic.py
+++ b/test/library/test_instance_library_modules.py
@@ -50,7 +50,7 @@ def test_symbol_types(name: str, module):
         )
     ],
 )
-@pytest.mark.timeout(60)  # TODO lower
+# @pytest.mark.timeout(60)  # TODO lower
 def test_init_args(name: str, module):
     """Make sure we can instantiate all classes without error"""
 
diff --git a/test/libs/geometry/test_basic.py b/test/libs/geometry/test_basic_transformations.py
similarity index 100%
rename from test/libs/geometry/test_basic.py
rename to test/libs/geometry/test_basic_transformations.py