diff --git a/tests/assembly/asm-comments.rs b/tests/assembly/asm/comments.rs
similarity index 100%
rename from tests/assembly/asm-comments.rs
rename to tests/assembly/asm/comments.rs
diff --git a/tests/codegen/asm-arm64ec-clobbers.rs b/tests/codegen/asm/arm64ec-clobbers.rs
similarity index 100%
rename from tests/codegen/asm-arm64ec-clobbers.rs
rename to tests/codegen/asm/arm64ec-clobbers.rs
diff --git a/tests/codegen/foo.s b/tests/codegen/asm/foo.s
similarity index 100%
rename from tests/codegen/foo.s
rename to tests/codegen/asm/foo.s
diff --git a/tests/codegen/global_asm.rs b/tests/codegen/asm/global_asm.rs
similarity index 100%
rename from tests/codegen/global_asm.rs
rename to tests/codegen/asm/global_asm.rs
diff --git a/tests/codegen/global_asm_include.rs b/tests/codegen/asm/global_asm_include.rs
similarity index 100%
rename from tests/codegen/global_asm_include.rs
rename to tests/codegen/asm/global_asm_include.rs
diff --git a/tests/codegen/global_asm_x2.rs b/tests/codegen/asm/global_asm_x2.rs
similarity index 100%
rename from tests/codegen/global_asm_x2.rs
rename to tests/codegen/asm/global_asm_x2.rs
diff --git a/tests/codegen/asm-goto.rs b/tests/codegen/asm/goto.rs
similarity index 100%
rename from tests/codegen/asm-goto.rs
rename to tests/codegen/asm/goto.rs
diff --git a/tests/codegen/asm-may_unwind.rs b/tests/codegen/asm/may_unwind.rs
similarity index 100%
rename from tests/codegen/asm-may_unwind.rs
rename to tests/codegen/asm/may_unwind.rs
diff --git a/tests/codegen/asm-maybe-uninit.rs b/tests/codegen/asm/maybe-uninit.rs
similarity index 100%
rename from tests/codegen/asm-maybe-uninit.rs
rename to tests/codegen/asm/maybe-uninit.rs
diff --git a/tests/codegen/asm-msp430-clobbers.rs b/tests/codegen/asm/msp430-clobbers.rs
similarity index 100%
rename from tests/codegen/asm-msp430-clobbers.rs
rename to tests/codegen/asm/msp430-clobbers.rs
diff --git a/tests/codegen/asm-multiple-options.rs b/tests/codegen/asm/multiple-options.rs
similarity index 100%
rename from tests/codegen/asm-multiple-options.rs
rename to tests/codegen/asm/multiple-options.rs
diff --git a/tests/codegen/asm-options.rs b/tests/codegen/asm/options.rs
similarity index 100%
rename from tests/codegen/asm-options.rs
rename to tests/codegen/asm/options.rs
diff --git a/tests/codegen/asm-powerpc-clobbers.rs b/tests/codegen/asm/powerpc-clobbers.rs
similarity index 100%
rename from tests/codegen/asm-powerpc-clobbers.rs
rename to tests/codegen/asm/powerpc-clobbers.rs
diff --git a/tests/codegen/asm-s390x-clobbers.rs b/tests/codegen/asm/s390x-clobbers.rs
similarity index 100%
rename from tests/codegen/asm-s390x-clobbers.rs
rename to tests/codegen/asm/s390x-clobbers.rs
diff --git a/tests/codegen/asm-sanitize-llvm.rs b/tests/codegen/asm/sanitize-llvm.rs
similarity index 100%
rename from tests/codegen/asm-sanitize-llvm.rs
rename to tests/codegen/asm/sanitize-llvm.rs
diff --git a/tests/codegen/asm-clobber_abi.rs b/tests/codegen/asm/x86-clobber_abi.rs
similarity index 100%
rename from tests/codegen/asm-clobber_abi.rs
rename to tests/codegen/asm/x86-clobber_abi.rs
diff --git a/tests/codegen/asm-clobbers.rs b/tests/codegen/asm/x86-clobbers.rs
similarity index 100%
rename from tests/codegen/asm-clobbers.rs
rename to tests/codegen/asm/x86-clobbers.rs
diff --git a/tests/codegen/asm-target-clobbers.rs b/tests/codegen/asm/x86-target-clobbers.rs
similarity index 100%
rename from tests/codegen/asm-target-clobbers.rs
rename to tests/codegen/asm/x86-target-clobbers.rs