diff --git a/tests/pass/weak_memory/consistency.rs b/tests/pass/0weak_memory_consistency.rs
similarity index 99%
rename from tests/pass/weak_memory/consistency.rs
rename to tests/pass/0weak_memory_consistency.rs
index 8a7c1340cc59..fc9dce0c986a 100644
--- a/tests/pass/weak_memory/consistency.rs
+++ b/tests/pass/0weak_memory_consistency.rs
@@ -214,7 +214,7 @@ fn test_single_thread() {
 }
 
 pub fn main() {
-    for _ in 0..100 {
+    for _ in 0..50 {
         test_single_thread();
         test_mixed_access();
         test_load_buffering_acq_rel();
diff --git a/tests/pass/backtrace-api-v0.rs b/tests/pass/backtrace/backtrace-api-v0.rs
similarity index 100%
rename from tests/pass/backtrace-api-v0.rs
rename to tests/pass/backtrace/backtrace-api-v0.rs
diff --git a/tests/pass/backtrace-api-v0.stderr b/tests/pass/backtrace/backtrace-api-v0.stderr
similarity index 100%
rename from tests/pass/backtrace-api-v0.stderr
rename to tests/pass/backtrace/backtrace-api-v0.stderr
diff --git a/tests/pass/backtrace-api-v0.stdout b/tests/pass/backtrace/backtrace-api-v0.stdout
similarity index 100%
rename from tests/pass/backtrace-api-v0.stdout
rename to tests/pass/backtrace/backtrace-api-v0.stdout
diff --git a/tests/pass/backtrace-api-v1.rs b/tests/pass/backtrace/backtrace-api-v1.rs
similarity index 100%
rename from tests/pass/backtrace-api-v1.rs
rename to tests/pass/backtrace/backtrace-api-v1.rs
diff --git a/tests/pass/backtrace-api-v1.stderr b/tests/pass/backtrace/backtrace-api-v1.stderr
similarity index 100%
rename from tests/pass/backtrace-api-v1.stderr
rename to tests/pass/backtrace/backtrace-api-v1.stderr
diff --git a/tests/pass/backtrace-api-v1.stdout b/tests/pass/backtrace/backtrace-api-v1.stdout
similarity index 100%
rename from tests/pass/backtrace-api-v1.stdout
rename to tests/pass/backtrace/backtrace-api-v1.stdout
diff --git a/tests/pass/backtrace-global-alloc.rs b/tests/pass/backtrace/backtrace-global-alloc.rs
similarity index 100%
rename from tests/pass/backtrace-global-alloc.rs
rename to tests/pass/backtrace/backtrace-global-alloc.rs
diff --git a/tests/pass/backtrace-global-alloc.stderr b/tests/pass/backtrace/backtrace-global-alloc.stderr
similarity index 100%
rename from tests/pass/backtrace-global-alloc.stderr
rename to tests/pass/backtrace/backtrace-global-alloc.stderr
diff --git a/tests/pass/backtrace-std.rs b/tests/pass/backtrace/backtrace-std.rs
similarity index 100%
rename from tests/pass/backtrace-std.rs
rename to tests/pass/backtrace/backtrace-std.rs
diff --git a/tests/pass/backtrace-std.stderr b/tests/pass/backtrace/backtrace-std.stderr
similarity index 100%
rename from tests/pass/backtrace-std.stderr
rename to tests/pass/backtrace/backtrace-std.stderr
diff --git a/tests/pass/issue-15063.rs b/tests/pass/issues/issue-15063.rs
similarity index 100%
rename from tests/pass/issue-15063.rs
rename to tests/pass/issues/issue-15063.rs
diff --git a/tests/pass/issue-15080.rs b/tests/pass/issues/issue-15080.rs
similarity index 100%
rename from tests/pass/issue-15080.rs
rename to tests/pass/issues/issue-15080.rs
diff --git a/tests/pass/issue-15523-big.rs b/tests/pass/issues/issue-15523-big.rs
similarity index 100%
rename from tests/pass/issue-15523-big.rs
rename to tests/pass/issues/issue-15523-big.rs
diff --git a/tests/pass/issue-17877.rs b/tests/pass/issues/issue-17877.rs
similarity index 100%
rename from tests/pass/issue-17877.rs
rename to tests/pass/issues/issue-17877.rs
diff --git a/tests/pass/issue-20575.rs b/tests/pass/issues/issue-20575.rs
similarity index 100%
rename from tests/pass/issue-20575.rs
rename to tests/pass/issues/issue-20575.rs
diff --git a/tests/pass/issue-23261.rs b/tests/pass/issues/issue-23261.rs
similarity index 100%
rename from tests/pass/issue-23261.rs
rename to tests/pass/issues/issue-23261.rs
diff --git a/tests/pass/issue-26709.rs b/tests/pass/issues/issue-26709.rs
similarity index 100%
rename from tests/pass/issue-26709.rs
rename to tests/pass/issues/issue-26709.rs
diff --git a/tests/pass/issue-27901.rs b/tests/pass/issues/issue-27901.rs
similarity index 100%
rename from tests/pass/issue-27901.rs
rename to tests/pass/issues/issue-27901.rs
diff --git a/tests/pass/issue-29746.rs b/tests/pass/issues/issue-29746.rs
similarity index 100%
rename from tests/pass/issue-29746.rs
rename to tests/pass/issues/issue-29746.rs
diff --git a/tests/pass/issue-30530.rs b/tests/pass/issues/issue-30530.rs
similarity index 100%
rename from tests/pass/issue-30530.rs
rename to tests/pass/issues/issue-30530.rs
diff --git a/tests/pass/issue-31267-additional.rs b/tests/pass/issues/issue-31267-additional.rs
similarity index 100%
rename from tests/pass/issue-31267-additional.rs
rename to tests/pass/issues/issue-31267-additional.rs
diff --git a/tests/pass/issue-33387.rs b/tests/pass/issues/issue-33387.rs
similarity index 100%
rename from tests/pass/issue-33387.rs
rename to tests/pass/issues/issue-33387.rs
diff --git a/tests/pass/issue-34571.rs b/tests/pass/issues/issue-34571.rs
similarity index 100%
rename from tests/pass/issue-34571.rs
rename to tests/pass/issues/issue-34571.rs
diff --git a/tests/pass/issue-35815.rs b/tests/pass/issues/issue-35815.rs
similarity index 100%
rename from tests/pass/issue-35815.rs
rename to tests/pass/issues/issue-35815.rs
diff --git a/tests/pass/issue-36278-prefix-nesting.rs b/tests/pass/issues/issue-36278-prefix-nesting.rs
similarity index 100%
rename from tests/pass/issue-36278-prefix-nesting.rs
rename to tests/pass/issues/issue-36278-prefix-nesting.rs
diff --git a/tests/pass/issue-3794.rs b/tests/pass/issues/issue-3794.rs
similarity index 100%
rename from tests/pass/issue-3794.rs
rename to tests/pass/issues/issue-3794.rs
diff --git a/tests/pass/issue-3794.stdout b/tests/pass/issues/issue-3794.stdout
similarity index 100%
rename from tests/pass/issue-3794.stdout
rename to tests/pass/issues/issue-3794.stdout
diff --git a/tests/pass/issue-53728.rs b/tests/pass/issues/issue-53728.rs
similarity index 100%
rename from tests/pass/issue-53728.rs
rename to tests/pass/issues/issue-53728.rs
diff --git a/tests/pass/issue-5917.rs b/tests/pass/issues/issue-5917.rs
similarity index 100%
rename from tests/pass/issue-5917.rs
rename to tests/pass/issues/issue-5917.rs
diff --git a/tests/pass/issue-73223.rs b/tests/pass/issues/issue-73223.rs
similarity index 100%
rename from tests/pass/issue-73223.rs
rename to tests/pass/issues/issue-73223.rs
diff --git a/tests/pass/issue-91636.rs b/tests/pass/issues/issue-91636.rs
similarity index 100%
rename from tests/pass/issue-91636.rs
rename to tests/pass/issues/issue-91636.rs
diff --git a/tests/pass/issue-94371.rs b/tests/pass/issues/issue-94371.rs
similarity index 100%
rename from tests/pass/issue-94371.rs
rename to tests/pass/issues/issue-94371.rs
diff --git a/tests/pass/issue-miri-1075.rs b/tests/pass/issues/issue-miri-1075.rs
similarity index 100%
rename from tests/pass/issue-miri-1075.rs
rename to tests/pass/issues/issue-miri-1075.rs
diff --git a/tests/pass/issue-miri-133.rs b/tests/pass/issues/issue-miri-133.rs
similarity index 100%
rename from tests/pass/issue-miri-133.rs
rename to tests/pass/issues/issue-miri-133.rs
diff --git a/tests/pass/issue-miri-184.rs b/tests/pass/issues/issue-miri-184.rs
similarity index 100%
rename from tests/pass/issue-miri-184.rs
rename to tests/pass/issues/issue-miri-184.rs
diff --git a/tests/pass/issue-miri-1925.rs b/tests/pass/issues/issue-miri-1925.rs
similarity index 100%
rename from tests/pass/issue-miri-1925.rs
rename to tests/pass/issues/issue-miri-1925.rs
diff --git a/tests/pass/issue-miri-2068-2.rs b/tests/pass/issues/issue-miri-2068-2.rs
similarity index 100%
rename from tests/pass/issue-miri-2068-2.rs
rename to tests/pass/issues/issue-miri-2068-2.rs
diff --git a/tests/pass/issue-miri-2068.rs b/tests/pass/issues/issue-miri-2068.rs
similarity index 100%
rename from tests/pass/issue-miri-2068.rs
rename to tests/pass/issues/issue-miri-2068.rs