diff --git a/tests/test_runname.py b/tests/test_core_runname.py
similarity index 97%
rename from tests/test_runname.py
rename to tests/test_core_runname.py
index 4344bbae4..05ec1d9d5 100644
--- a/tests/test_runname.py
+++ b/tests/test_core_runname.py
@@ -82,7 +82,7 @@ def test_extract_runnumbers_valid(fnames, prefix, separator, expected):
         ("experiment_", "005", "_", "measure", ".csv", "experiment_005_measure"),
     ],
 )
-def test_fill_filename_pattern_various_combinations(prefix, run_index, separator, name, suffix, expected):
+def test_fill_filename_pattern(prefix, run_index, separator, name, suffix, expected):
     gen = RunFilenameGenerator(
         base_dir=".",
         prefix=prefix,
@@ -154,7 +154,7 @@ def test_get_existing_runnumbers_empty(monkeypatch, tmpdir_runs):
         ),
     ],
 )
-def test_base_dir_respect_real(tmpdir, file_structure, search_base_dir, prefix, separator, suffix, n_digits, expected_next):
+def test_get_next_run_filename(tmpdir, file_structure, search_base_dir, prefix, separator, suffix, n_digits, expected_next):
     for dir_path, filenames in file_structure.items():
         current_dir = tmpdir
         for part in dir_path.split("/"):