diff --git a/tests/fail/leak_in_os_tls.rs b/tests/fail/leak_in_lib_tls.rs
similarity index 100%
rename from tests/fail/leak_in_os_tls.rs
rename to tests/fail/leak_in_lib_tls.rs
diff --git a/tests/fail/leak_in_os_tls.stderr b/tests/fail/leak_in_lib_tls.stderr
similarity index 100%
rename from tests/fail/leak_in_os_tls.stderr
rename to tests/fail/leak_in_lib_tls.stderr
diff --git a/tests/fail/leak_in_tls.rs b/tests/fail/leak_in_static_tls.rs
similarity index 100%
rename from tests/fail/leak_in_tls.rs
rename to tests/fail/leak_in_static_tls.rs
diff --git a/tests/fail/leak_in_tls.stderr b/tests/fail/leak_in_static_tls.stderr
similarity index 100%
rename from tests/fail/leak_in_tls.stderr
rename to tests/fail/leak_in_static_tls.stderr
diff --git a/tests/pass/issues/issue-miri-2881.rs b/tests/pass/concurrency/tls_leak_main_thread_allowed.rs
similarity index 100%
rename from tests/pass/issues/issue-miri-2881.rs
rename to tests/pass/concurrency/tls_leak_main_thread_allowed.rs