diff --git a/test_suite/tests/expand/derive/enum/de_enum.expanded.rs b/test_suite/tests/expand/de_enum.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/de_enum.expanded.rs
rename to test_suite/tests/expand/de_enum.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/de_enum.rs b/test_suite/tests/expand/de_enum.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/de_enum.rs
rename to test_suite/tests/expand/de_enum.rs
diff --git a/test_suite/tests/expand/derive/struct/default_ty_param.expanded.rs b/test_suite/tests/expand/default_ty_param.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/default_ty_param.expanded.rs
rename to test_suite/tests/expand/default_ty_param.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/default_ty_param.rs b/test_suite/tests/expand/default_ty_param.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/default_ty_param.rs
rename to test_suite/tests/expand/default_ty_param.rs
diff --git a/test_suite/tests/expand/derive/enum/generic_enum.expanded.rs b/test_suite/tests/expand/generic_enum.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/generic_enum.expanded.rs
rename to test_suite/tests/expand/generic_enum.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/generic_enum.rs b/test_suite/tests/expand/generic_enum.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/generic_enum.rs
rename to test_suite/tests/expand/generic_enum.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_struct.expanded.rs b/test_suite/tests/expand/generic_struct.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_struct.expanded.rs
rename to test_suite/tests/expand/generic_struct.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_struct.rs b/test_suite/tests/expand/generic_struct.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_struct.rs
rename to test_suite/tests/expand/generic_struct.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_tuple_struct.expanded.rs b/test_suite/tests/expand/generic_tuple_struct.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_tuple_struct.expanded.rs
rename to test_suite/tests/expand/generic_tuple_struct.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_tuple_struct.rs b/test_suite/tests/expand/generic_tuple_struct.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_tuple_struct.rs
rename to test_suite/tests/expand/generic_tuple_struct.rs
diff --git a/test_suite/tests/expand/derive/enum/lifetimes.expanded.rs b/test_suite/tests/expand/lifetimes.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/lifetimes.expanded.rs
rename to test_suite/tests/expand/lifetimes.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/lifetimes.rs b/test_suite/tests/expand/lifetimes.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/lifetimes.rs
rename to test_suite/tests/expand/lifetimes.rs
diff --git a/test_suite/tests/expand/derive/struct/named_map.expanded.rs b/test_suite/tests/expand/named_map.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_map.expanded.rs
rename to test_suite/tests/expand/named_map.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/named_map.rs b/test_suite/tests/expand/named_map.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_map.rs
rename to test_suite/tests/expand/named_map.rs
diff --git a/test_suite/tests/expand/derive/struct/named_tuple.expanded.rs b/test_suite/tests/expand/named_tuple.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_tuple.expanded.rs
rename to test_suite/tests/expand/named_tuple.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/named_tuple.rs b/test_suite/tests/expand/named_tuple.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_tuple.rs
rename to test_suite/tests/expand/named_tuple.rs
diff --git a/test_suite/tests/expand/derive/struct/named_unit.expanded.rs b/test_suite/tests/expand/named_unit.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_unit.expanded.rs
rename to test_suite/tests/expand/named_unit.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/named_unit.rs b/test_suite/tests/expand/named_unit.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_unit.rs
rename to test_suite/tests/expand/named_unit.rs
diff --git a/test_suite/tests/expand/derive/enum/ser_enum.expanded.rs b/test_suite/tests/expand/ser_enum.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/ser_enum.expanded.rs
rename to test_suite/tests/expand/ser_enum.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/ser_enum.rs b/test_suite/tests/expand/ser_enum.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/ser_enum.rs
rename to test_suite/tests/expand/ser_enum.rs
diff --git a/test_suite/tests/expand/derive/enum/void.expanded.rs b/test_suite/tests/expand/void.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/void.expanded.rs
rename to test_suite/tests/expand/void.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/void.rs b/test_suite/tests/expand/void.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/void.rs
rename to test_suite/tests/expand/void.rs
diff --git a/test_suite/tests/expandtest.rs b/test_suite/tests/expandtest.rs
index b51ab054..8e3a8639 100644
--- a/test_suite/tests/expandtest.rs
+++ b/test_suite/tests/expandtest.rs
@@ -3,6 +3,5 @@
 #[cfg_attr(not(cargo_expand), ignore)]
 #[test]
 fn expandtest() {
-    macrotest::expand("tests/expand/**/enum/*.rs");
-    macrotest::expand("tests/expand/**/struct/*.rs");
+    macrotest::expand("tests/expand/*.rs");
 }