diff --git a/gcc/testsuite/rust/compile/proc_macro_attribute_crate_type.rs b/gcc/testsuite/rust/compile/macros/proc/attribute_crate_type.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_attribute_crate_type.rs
rename to gcc/testsuite/rust/compile/macros/proc/attribute_crate_type.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_attribute_non_function.rs b/gcc/testsuite/rust/compile/macros/proc/attribute_non_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_attribute_non_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/attribute_non_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_attribute_non_root_function.rs b/gcc/testsuite/rust/compile/macros/proc/attribute_non_root_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_attribute_non_root_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/attribute_non_root_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_attribute_non_root_method.rs b/gcc/testsuite/rust/compile/macros/proc/attribute_non_root_method.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_attribute_non_root_method.rs
rename to gcc/testsuite/rust/compile/macros/proc/attribute_non_root_method.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_attribute_non_root_module.rs b/gcc/testsuite/rust/compile/macros/proc/attribute_non_root_module.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_attribute_non_root_module.rs
rename to gcc/testsuite/rust/compile/macros/proc/attribute_non_root_module.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_attribute_private.rs b/gcc/testsuite/rust/compile/macros/proc/attribute_private.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_attribute_private.rs
rename to gcc/testsuite/rust/compile/macros/proc/attribute_private.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_crate_type.rs b/gcc/testsuite/rust/compile/macros/proc/crate_type.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_crate_type.rs
rename to gcc/testsuite/rust/compile/macros/proc/crate_type.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_crate_type.rs b/gcc/testsuite/rust/compile/macros/proc/derive_crate_type.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_crate_type.rs
rename to gcc/testsuite/rust/compile/macros/proc/derive_crate_type.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_malformed.rs b/gcc/testsuite/rust/compile/macros/proc/derive_malformed.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_malformed.rs
rename to gcc/testsuite/rust/compile/macros/proc/derive_malformed.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_non_function.rs b/gcc/testsuite/rust/compile/macros/proc/derive_non_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_non_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/derive_non_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_non_root_function.rs b/gcc/testsuite/rust/compile/macros/proc/derive_non_root_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_non_root_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/derive_non_root_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_non_root_module.rs b/gcc/testsuite/rust/compile/macros/proc/derive_non_root_module.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_non_root_module.rs
rename to gcc/testsuite/rust/compile/macros/proc/derive_non_root_module.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_private.rs b/gcc/testsuite/rust/compile/macros/proc/derive_private.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_private.rs
rename to gcc/testsuite/rust/compile/macros/proc/derive_private.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_non_function.rs b/gcc/testsuite/rust/compile/macros/proc/non_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_non_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/non_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_non_root_function.rs b/gcc/testsuite/rust/compile/macros/proc/non_root_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_non_root_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/non_root_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_non_root_method.rs b/gcc/testsuite/rust/compile/macros/proc/non_root_method.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_non_root_method.rs
rename to gcc/testsuite/rust/compile/macros/proc/non_root_method.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_non_root_module.rs b/gcc/testsuite/rust/compile/macros/proc/non_root_module.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_non_root_module.rs
rename to gcc/testsuite/rust/compile/macros/proc/non_root_module.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_derive_non_root_method.rs b/gcc/testsuite/rust/compile/macros/proc/non_root_trait_method.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_derive_non_root_method.rs
rename to gcc/testsuite/rust/compile/macros/proc/non_root_trait_method.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_private.rs b/gcc/testsuite/rust/compile/macros/proc/private.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_private.rs
rename to gcc/testsuite/rust/compile/macros/proc/private.rs
diff --git a/gcc/testsuite/rust/compile/macros/proc/proc_macro.exp b/gcc/testsuite/rust/compile/macros/proc/proc_macro.exp
new file mode 100644
index 000000000000..ac891db246e3
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macros/proc/proc_macro.exp
@@ -0,0 +1,35 @@
+# Copyright (C) 2021-2024 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Compile tests, no torture testing.
+#
+# These tests raise errors in the front end; torture testing doesn't apply.
+
+# Load support procs.
+load_lib rust-dg.exp
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+set saved-dg-do-what-default ${dg-do-what-default}
+
+set dg-do-what-default "compile"
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.rs]] "" ""
+set dg-do-what-default ${saved-dg-do-what-default}
+
+# All done.
+dg-finish
diff --git a/gcc/testsuite/rust/compile/proc_macro_pub_function.rs b/gcc/testsuite/rust/compile/macros/proc/pub_function.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_pub_function.rs
rename to gcc/testsuite/rust/compile/macros/proc/pub_function.rs
diff --git a/gcc/testsuite/rust/compile/proc_macro_pub_module.rs b/gcc/testsuite/rust/compile/macros/proc/pub_module.rs
similarity index 100%
rename from gcc/testsuite/rust/compile/proc_macro_pub_module.rs
rename to gcc/testsuite/rust/compile/macros/proc/pub_module.rs