diff --git a/.gitattributes b/.gitattributes
index 40e9d89..2da8204 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 # Running test suite will update test expectations to use LF line endings,
 # so they need to be checked out using LF as well.
 * text=auto eol=lf
+linestyle_crlf* -text
diff --git a/tests/expectations/both/alias.c b/tests/expectations/alias.both.c
similarity index 100%
rename from tests/expectations/both/alias.c
rename to tests/expectations/alias.both.c
diff --git a/tests/expectations/both/alias.compat.c b/tests/expectations/alias.both.compat.c
similarity index 100%
rename from tests/expectations/both/alias.compat.c
rename to tests/expectations/alias.both.compat.c
diff --git a/tests/expectations/tag/alias.c b/tests/expectations/alias.tag.c
similarity index 100%
rename from tests/expectations/tag/alias.c
rename to tests/expectations/alias.tag.c
diff --git a/tests/expectations/tag/alias.compat.c b/tests/expectations/alias.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/alias.compat.c
rename to tests/expectations/alias.tag.compat.c
diff --git a/tests/expectations/both/annotation.c b/tests/expectations/annotation.both.c
similarity index 100%
rename from tests/expectations/both/annotation.c
rename to tests/expectations/annotation.both.c
diff --git a/tests/expectations/both/annotation.compat.c b/tests/expectations/annotation.both.compat.c
similarity index 100%
rename from tests/expectations/both/annotation.compat.c
rename to tests/expectations/annotation.both.compat.c
diff --git a/tests/expectations/tag/annotation.c b/tests/expectations/annotation.tag.c
similarity index 100%
rename from tests/expectations/tag/annotation.c
rename to tests/expectations/annotation.tag.c
diff --git a/tests/expectations/tag/annotation.compat.c b/tests/expectations/annotation.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/annotation.compat.c
rename to tests/expectations/annotation.tag.compat.c
diff --git a/tests/expectations/both/array.c b/tests/expectations/array.both.c
similarity index 100%
rename from tests/expectations/both/array.c
rename to tests/expectations/array.both.c
diff --git a/tests/expectations/both/array.compat.c b/tests/expectations/array.both.compat.c
similarity index 100%
rename from tests/expectations/both/array.compat.c
rename to tests/expectations/array.both.compat.c
diff --git a/tests/expectations/tag/array.c b/tests/expectations/array.tag.c
similarity index 100%
rename from tests/expectations/tag/array.c
rename to tests/expectations/array.tag.c
diff --git a/tests/expectations/tag/array.compat.c b/tests/expectations/array.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/array.compat.c
rename to tests/expectations/array.tag.compat.c
diff --git a/tests/expectations/both/asserted-cast.c b/tests/expectations/asserted-cast.both.c
similarity index 100%
rename from tests/expectations/both/asserted-cast.c
rename to tests/expectations/asserted-cast.both.c
diff --git a/tests/expectations/both/asserted-cast.compat.c b/tests/expectations/asserted-cast.both.compat.c
similarity index 100%
rename from tests/expectations/both/asserted-cast.compat.c
rename to tests/expectations/asserted-cast.both.compat.c
diff --git a/tests/expectations/tag/asserted-cast.c b/tests/expectations/asserted-cast.tag.c
similarity index 100%
rename from tests/expectations/tag/asserted-cast.c
rename to tests/expectations/asserted-cast.tag.c
diff --git a/tests/expectations/tag/asserted-cast.compat.c b/tests/expectations/asserted-cast.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/asserted-cast.compat.c
rename to tests/expectations/asserted-cast.tag.compat.c
diff --git a/tests/expectations/both/assoc_const_conflict.c b/tests/expectations/assoc_const_conflict.both.c
similarity index 100%
rename from tests/expectations/both/assoc_const_conflict.c
rename to tests/expectations/assoc_const_conflict.both.c
diff --git a/tests/expectations/both/assoc_const_conflict.compat.c b/tests/expectations/assoc_const_conflict.both.compat.c
similarity index 100%
rename from tests/expectations/both/assoc_const_conflict.compat.c
rename to tests/expectations/assoc_const_conflict.both.compat.c
diff --git a/tests/expectations/both/const_conflict.c b/tests/expectations/assoc_const_conflict.tag.c
similarity index 100%
rename from tests/expectations/both/const_conflict.c
rename to tests/expectations/assoc_const_conflict.tag.c
diff --git a/tests/expectations/both/const_conflict.compat.c b/tests/expectations/assoc_const_conflict.tag.compat.c
similarity index 100%
rename from tests/expectations/both/const_conflict.compat.c
rename to tests/expectations/assoc_const_conflict.tag.compat.c
diff --git a/tests/expectations/both/assoc_constant.c b/tests/expectations/assoc_constant.both.c
similarity index 100%
rename from tests/expectations/both/assoc_constant.c
rename to tests/expectations/assoc_constant.both.c
diff --git a/tests/expectations/both/assoc_constant.compat.c b/tests/expectations/assoc_constant.both.compat.c
similarity index 100%
rename from tests/expectations/both/assoc_constant.compat.c
rename to tests/expectations/assoc_constant.both.compat.c
diff --git a/tests/expectations/tag/assoc_constant.c b/tests/expectations/assoc_constant.tag.c
similarity index 100%
rename from tests/expectations/tag/assoc_constant.c
rename to tests/expectations/assoc_constant.tag.c
diff --git a/tests/expectations/tag/assoc_constant.compat.c b/tests/expectations/assoc_constant.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/assoc_constant.compat.c
rename to tests/expectations/assoc_constant.tag.compat.c
diff --git a/tests/expectations/both/associated_constant_panic.c b/tests/expectations/associated_constant_panic.both.c
similarity index 100%
rename from tests/expectations/both/associated_constant_panic.c
rename to tests/expectations/associated_constant_panic.both.c
diff --git a/tests/expectations/both/associated_constant_panic.compat.c b/tests/expectations/associated_constant_panic.both.compat.c
similarity index 100%
rename from tests/expectations/both/associated_constant_panic.compat.c
rename to tests/expectations/associated_constant_panic.both.compat.c
diff --git a/tests/expectations/both/cfg-field.c b/tests/expectations/associated_constant_panic.tag.c
similarity index 100%
rename from tests/expectations/both/cfg-field.c
rename to tests/expectations/associated_constant_panic.tag.c
diff --git a/tests/expectations/both/cfg-field.compat.c b/tests/expectations/associated_constant_panic.tag.compat.c
similarity index 100%
rename from tests/expectations/both/cfg-field.compat.c
rename to tests/expectations/associated_constant_panic.tag.compat.c
diff --git a/tests/expectations/both/associated_in_body.c b/tests/expectations/associated_in_body.both.c
similarity index 100%
rename from tests/expectations/both/associated_in_body.c
rename to tests/expectations/associated_in_body.both.c
diff --git a/tests/expectations/both/associated_in_body.compat.c b/tests/expectations/associated_in_body.both.compat.c
similarity index 100%
rename from tests/expectations/both/associated_in_body.compat.c
rename to tests/expectations/associated_in_body.both.compat.c
diff --git a/tests/expectations/tag/associated_in_body.c b/tests/expectations/associated_in_body.tag.c
similarity index 100%
rename from tests/expectations/tag/associated_in_body.c
rename to tests/expectations/associated_in_body.tag.c
diff --git a/tests/expectations/tag/associated_in_body.compat.c b/tests/expectations/associated_in_body.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/associated_in_body.compat.c
rename to tests/expectations/associated_in_body.tag.compat.c
diff --git a/tests/expectations/both/bitflags.c b/tests/expectations/bitflags.both.c
similarity index 100%
rename from tests/expectations/both/bitflags.c
rename to tests/expectations/bitflags.both.c
diff --git a/tests/expectations/both/bitflags.compat.c b/tests/expectations/bitflags.both.compat.c
similarity index 100%
rename from tests/expectations/both/bitflags.compat.c
rename to tests/expectations/bitflags.both.compat.c
diff --git a/tests/expectations/tag/bitflags.c b/tests/expectations/bitflags.tag.c
similarity index 100%
rename from tests/expectations/tag/bitflags.c
rename to tests/expectations/bitflags.tag.c
diff --git a/tests/expectations/tag/bitflags.compat.c b/tests/expectations/bitflags.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/bitflags.compat.c
rename to tests/expectations/bitflags.tag.compat.c
diff --git a/tests/expectations/both/body.c b/tests/expectations/body.both.c
similarity index 100%
rename from tests/expectations/both/body.c
rename to tests/expectations/body.both.c
diff --git a/tests/expectations/both/body.compat.c b/tests/expectations/body.both.compat.c
similarity index 100%
rename from tests/expectations/both/body.compat.c
rename to tests/expectations/body.both.compat.c
diff --git a/tests/expectations/tag/body.c b/tests/expectations/body.tag.c
similarity index 100%
rename from tests/expectations/tag/body.c
rename to tests/expectations/body.tag.c
diff --git a/tests/expectations/tag/body.compat.c b/tests/expectations/body.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/body.compat.c
rename to tests/expectations/body.tag.compat.c
diff --git a/tests/expectations/both/box.c b/tests/expectations/box.both.c
similarity index 100%
rename from tests/expectations/both/box.c
rename to tests/expectations/box.both.c
diff --git a/tests/expectations/both/box.compat.c b/tests/expectations/box.both.compat.c
similarity index 100%
rename from tests/expectations/both/box.compat.c
rename to tests/expectations/box.both.compat.c
diff --git a/tests/expectations/tag/box.c b/tests/expectations/box.tag.c
similarity index 100%
rename from tests/expectations/tag/box.c
rename to tests/expectations/box.tag.c
diff --git a/tests/expectations/tag/box.compat.c b/tests/expectations/box.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/box.compat.c
rename to tests/expectations/box.tag.compat.c
diff --git a/tests/expectations/both/cdecl.c b/tests/expectations/cdecl.both.c
similarity index 100%
rename from tests/expectations/both/cdecl.c
rename to tests/expectations/cdecl.both.c
diff --git a/tests/expectations/both/cdecl.compat.c b/tests/expectations/cdecl.both.compat.c
similarity index 100%
rename from tests/expectations/both/cdecl.compat.c
rename to tests/expectations/cdecl.both.compat.c
diff --git a/tests/expectations/tag/cdecl.c b/tests/expectations/cdecl.tag.c
similarity index 100%
rename from tests/expectations/tag/cdecl.c
rename to tests/expectations/cdecl.tag.c
diff --git a/tests/expectations/tag/cdecl.compat.c b/tests/expectations/cdecl.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/cdecl.compat.c
rename to tests/expectations/cdecl.tag.compat.c
diff --git a/tests/expectations/both/cell.c b/tests/expectations/cell.both.c
similarity index 100%
rename from tests/expectations/both/cell.c
rename to tests/expectations/cell.both.c
diff --git a/tests/expectations/both/cell.compat.c b/tests/expectations/cell.both.compat.c
similarity index 100%
rename from tests/expectations/both/cell.compat.c
rename to tests/expectations/cell.both.compat.c
diff --git a/tests/expectations/tag/cell.c b/tests/expectations/cell.tag.c
similarity index 100%
rename from tests/expectations/tag/cell.c
rename to tests/expectations/cell.tag.c
diff --git a/tests/expectations/tag/cell.compat.c b/tests/expectations/cell.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/cell.compat.c
rename to tests/expectations/cell.tag.compat.c
diff --git a/tests/expectations/both/cfg-2.c b/tests/expectations/cfg-2.both.c
similarity index 100%
rename from tests/expectations/both/cfg-2.c
rename to tests/expectations/cfg-2.both.c
diff --git a/tests/expectations/both/cfg-2.compat.c b/tests/expectations/cfg-2.both.compat.c
similarity index 100%
rename from tests/expectations/both/cfg-2.compat.c
rename to tests/expectations/cfg-2.both.compat.c
diff --git a/tests/expectations/tag/cfg-2.c b/tests/expectations/cfg-2.tag.c
similarity index 100%
rename from tests/expectations/tag/cfg-2.c
rename to tests/expectations/cfg-2.tag.c
diff --git a/tests/expectations/tag/cfg-2.compat.c b/tests/expectations/cfg-2.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/cfg-2.compat.c
rename to tests/expectations/cfg-2.tag.compat.c
diff --git a/tests/expectations/both/global_attr.c b/tests/expectations/cfg-field.both.c
similarity index 100%
rename from tests/expectations/both/global_attr.c
rename to tests/expectations/cfg-field.both.c
diff --git a/tests/expectations/both/global_attr.compat.c b/tests/expectations/cfg-field.both.compat.c
similarity index 100%
rename from tests/expectations/both/global_attr.compat.c
rename to tests/expectations/cfg-field.both.compat.c
diff --git a/tests/expectations/both/literal_target.c b/tests/expectations/cfg-field.tag.c
similarity index 100%
rename from tests/expectations/both/literal_target.c
rename to tests/expectations/cfg-field.tag.c
diff --git a/tests/expectations/both/literal_target.compat.c b/tests/expectations/cfg-field.tag.compat.c
similarity index 100%
rename from tests/expectations/both/literal_target.compat.c
rename to tests/expectations/cfg-field.tag.compat.c
diff --git a/tests/expectations/both/cfg.c b/tests/expectations/cfg.both.c
similarity index 100%
rename from tests/expectations/both/cfg.c
rename to tests/expectations/cfg.both.c
diff --git a/tests/expectations/both/cfg.compat.c b/tests/expectations/cfg.both.compat.c
similarity index 100%
rename from tests/expectations/both/cfg.compat.c
rename to tests/expectations/cfg.both.compat.c
diff --git a/tests/expectations/tag/cfg.c b/tests/expectations/cfg.tag.c
similarity index 100%
rename from tests/expectations/tag/cfg.c
rename to tests/expectations/cfg.tag.c
diff --git a/tests/expectations/tag/cfg.compat.c b/tests/expectations/cfg.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/cfg.compat.c
rename to tests/expectations/cfg.tag.compat.c
diff --git a/tests/expectations/both/char.c b/tests/expectations/char.both.c
similarity index 100%
rename from tests/expectations/both/char.c
rename to tests/expectations/char.both.c
diff --git a/tests/expectations/both/char.compat.c b/tests/expectations/char.both.compat.c
similarity index 100%
rename from tests/expectations/both/char.compat.c
rename to tests/expectations/char.both.compat.c
diff --git a/tests/expectations/tag/char.c b/tests/expectations/char.tag.c
similarity index 100%
rename from tests/expectations/tag/char.c
rename to tests/expectations/char.tag.c
diff --git a/tests/expectations/tag/char.compat.c b/tests/expectations/char.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/char.compat.c
rename to tests/expectations/char.tag.compat.c
diff --git a/tests/expectations/tag/assoc_const_conflict.c b/tests/expectations/const_conflict.both.c
similarity index 100%
rename from tests/expectations/tag/assoc_const_conflict.c
rename to tests/expectations/const_conflict.both.c
diff --git a/tests/expectations/tag/assoc_const_conflict.compat.c b/tests/expectations/const_conflict.both.compat.c
similarity index 100%
rename from tests/expectations/tag/assoc_const_conflict.compat.c
rename to tests/expectations/const_conflict.both.compat.c
diff --git a/tests/expectations/tag/const_conflict.c b/tests/expectations/const_conflict.tag.c
similarity index 100%
rename from tests/expectations/tag/const_conflict.c
rename to tests/expectations/const_conflict.tag.c
diff --git a/tests/expectations/tag/const_conflict.compat.c b/tests/expectations/const_conflict.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/const_conflict.compat.c
rename to tests/expectations/const_conflict.tag.compat.c
diff --git a/tests/expectations/both/const_transparent.c b/tests/expectations/const_transparent.both.c
similarity index 100%
rename from tests/expectations/both/const_transparent.c
rename to tests/expectations/const_transparent.both.c
diff --git a/tests/expectations/both/const_transparent.compat.c b/tests/expectations/const_transparent.both.compat.c
similarity index 100%
rename from tests/expectations/both/const_transparent.compat.c
rename to tests/expectations/const_transparent.both.compat.c
diff --git a/tests/expectations/tag/const_transparent.c b/tests/expectations/const_transparent.tag.c
similarity index 100%
rename from tests/expectations/tag/const_transparent.c
rename to tests/expectations/const_transparent.tag.c
diff --git a/tests/expectations/tag/const_transparent.compat.c b/tests/expectations/const_transparent.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/const_transparent.compat.c
rename to tests/expectations/const_transparent.tag.compat.c
diff --git a/tests/expectations/both/constant.c b/tests/expectations/constant.both.c
similarity index 100%
rename from tests/expectations/both/constant.c
rename to tests/expectations/constant.both.c
diff --git a/tests/expectations/both/constant.compat.c b/tests/expectations/constant.both.compat.c
similarity index 100%
rename from tests/expectations/both/constant.compat.c
rename to tests/expectations/constant.both.compat.c
diff --git a/tests/expectations/tag/constant.c b/tests/expectations/constant.tag.c
similarity index 100%
rename from tests/expectations/tag/constant.c
rename to tests/expectations/constant.tag.c
diff --git a/tests/expectations/tag/constant.compat.c b/tests/expectations/constant.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/constant.compat.c
rename to tests/expectations/constant.tag.compat.c
diff --git a/tests/expectations/both/constant_big.c b/tests/expectations/constant_big.both.c
similarity index 100%
rename from tests/expectations/both/constant_big.c
rename to tests/expectations/constant_big.both.c
diff --git a/tests/expectations/both/constant_big.compat.c b/tests/expectations/constant_big.both.compat.c
similarity index 100%
rename from tests/expectations/both/constant_big.compat.c
rename to tests/expectations/constant_big.both.compat.c
diff --git a/tests/expectations/tag/constant_big.c b/tests/expectations/constant_big.tag.c
similarity index 100%
rename from tests/expectations/tag/constant_big.c
rename to tests/expectations/constant_big.tag.c
diff --git a/tests/expectations/tag/constant_big.compat.c b/tests/expectations/constant_big.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/constant_big.compat.c
rename to tests/expectations/constant_big.tag.compat.c
diff --git a/tests/expectations/both/constant_constexpr.c b/tests/expectations/constant_constexpr.both.c
similarity index 100%
rename from tests/expectations/both/constant_constexpr.c
rename to tests/expectations/constant_constexpr.both.c
diff --git a/tests/expectations/both/constant_constexpr.compat.c b/tests/expectations/constant_constexpr.both.compat.c
similarity index 100%
rename from tests/expectations/both/constant_constexpr.compat.c
rename to tests/expectations/constant_constexpr.both.compat.c
diff --git a/tests/expectations/tag/constant_constexpr.c b/tests/expectations/constant_constexpr.tag.c
similarity index 100%
rename from tests/expectations/tag/constant_constexpr.c
rename to tests/expectations/constant_constexpr.tag.c
diff --git a/tests/expectations/tag/constant_constexpr.compat.c b/tests/expectations/constant_constexpr.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/constant_constexpr.compat.c
rename to tests/expectations/constant_constexpr.tag.compat.c
diff --git a/tests/expectations/both/constant_sort_name.c b/tests/expectations/constant_sort_name.both.c
similarity index 100%
rename from tests/expectations/both/constant_sort_name.c
rename to tests/expectations/constant_sort_name.both.c
diff --git a/tests/expectations/both/constant_sort_name.compat.c b/tests/expectations/constant_sort_name.both.compat.c
similarity index 100%
rename from tests/expectations/both/constant_sort_name.compat.c
rename to tests/expectations/constant_sort_name.both.compat.c
diff --git a/tests/expectations/tag/constant_sort_name.c b/tests/expectations/constant_sort_name.tag.c
similarity index 100%
rename from tests/expectations/tag/constant_sort_name.c
rename to tests/expectations/constant_sort_name.tag.c
diff --git a/tests/expectations/tag/constant_sort_name.compat.c b/tests/expectations/constant_sort_name.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/constant_sort_name.compat.c
rename to tests/expectations/constant_sort_name.tag.compat.c
diff --git a/tests/expectations/both/constant_sort_none.c b/tests/expectations/constant_sort_none.both.c
similarity index 100%
rename from tests/expectations/both/constant_sort_none.c
rename to tests/expectations/constant_sort_none.both.c
diff --git a/tests/expectations/both/constant_sort_none.compat.c b/tests/expectations/constant_sort_none.both.compat.c
similarity index 100%
rename from tests/expectations/both/constant_sort_none.compat.c
rename to tests/expectations/constant_sort_none.both.compat.c
diff --git a/tests/expectations/tag/constant_sort_none.c b/tests/expectations/constant_sort_none.tag.c
similarity index 100%
rename from tests/expectations/tag/constant_sort_none.c
rename to tests/expectations/constant_sort_none.tag.c
diff --git a/tests/expectations/tag/constant_sort_none.compat.c b/tests/expectations/constant_sort_none.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/constant_sort_none.compat.c
rename to tests/expectations/constant_sort_none.tag.compat.c
diff --git a/tests/expectations/both/constant_user_defined_type.c b/tests/expectations/constant_user_defined_type.both.c
similarity index 100%
rename from tests/expectations/both/constant_user_defined_type.c
rename to tests/expectations/constant_user_defined_type.both.c
diff --git a/tests/expectations/both/constant_user_defined_type.compat.c b/tests/expectations/constant_user_defined_type.both.compat.c
similarity index 100%
rename from tests/expectations/both/constant_user_defined_type.compat.c
rename to tests/expectations/constant_user_defined_type.both.compat.c
diff --git a/tests/expectations/tag/constant_user_defined_type.c b/tests/expectations/constant_user_defined_type.tag.c
similarity index 100%
rename from tests/expectations/tag/constant_user_defined_type.c
rename to tests/expectations/constant_user_defined_type.tag.c
diff --git a/tests/expectations/tag/constant_user_defined_type.compat.c b/tests/expectations/constant_user_defined_type.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/constant_user_defined_type.compat.c
rename to tests/expectations/constant_user_defined_type.tag.compat.c
diff --git a/tests/expectations/both/custom_header.c b/tests/expectations/custom_header.both.c
similarity index 100%
rename from tests/expectations/both/custom_header.c
rename to tests/expectations/custom_header.both.c
diff --git a/tests/expectations/both/custom_header.compat.c b/tests/expectations/custom_header.both.compat.c
similarity index 100%
rename from tests/expectations/both/custom_header.compat.c
rename to tests/expectations/custom_header.both.compat.c
diff --git a/tests/expectations/tag/custom_header.c b/tests/expectations/custom_header.tag.c
similarity index 100%
rename from tests/expectations/tag/custom_header.c
rename to tests/expectations/custom_header.tag.c
diff --git a/tests/expectations/tag/custom_header.compat.c b/tests/expectations/custom_header.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/custom_header.compat.c
rename to tests/expectations/custom_header.tag.compat.c
diff --git a/tests/expectations/both/dep_v2.c b/tests/expectations/dep_v2.both.c
similarity index 100%
rename from tests/expectations/both/dep_v2.c
rename to tests/expectations/dep_v2.both.c
diff --git a/tests/expectations/both/dep_v2.compat.c b/tests/expectations/dep_v2.both.compat.c
similarity index 100%
rename from tests/expectations/both/dep_v2.compat.c
rename to tests/expectations/dep_v2.both.compat.c
diff --git a/tests/expectations/tag/dep_v2.c b/tests/expectations/dep_v2.tag.c
similarity index 100%
rename from tests/expectations/tag/dep_v2.c
rename to tests/expectations/dep_v2.tag.c
diff --git a/tests/expectations/tag/dep_v2.compat.c b/tests/expectations/dep_v2.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/dep_v2.compat.c
rename to tests/expectations/dep_v2.tag.compat.c
diff --git a/tests/expectations/both/derive-eq.c b/tests/expectations/derive-eq.both.c
similarity index 100%
rename from tests/expectations/both/derive-eq.c
rename to tests/expectations/derive-eq.both.c
diff --git a/tests/expectations/both/derive-eq.compat.c b/tests/expectations/derive-eq.both.compat.c
similarity index 100%
rename from tests/expectations/both/derive-eq.compat.c
rename to tests/expectations/derive-eq.both.compat.c
diff --git a/tests/expectations/tag/derive-eq.c b/tests/expectations/derive-eq.tag.c
similarity index 100%
rename from tests/expectations/tag/derive-eq.c
rename to tests/expectations/derive-eq.tag.c
diff --git a/tests/expectations/tag/derive-eq.compat.c b/tests/expectations/derive-eq.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/derive-eq.compat.c
rename to tests/expectations/derive-eq.tag.compat.c
diff --git a/tests/expectations/both/derive_ostream.c b/tests/expectations/derive_ostream.both.c
similarity index 100%
rename from tests/expectations/both/derive_ostream.c
rename to tests/expectations/derive_ostream.both.c
diff --git a/tests/expectations/both/derive_ostream.compat.c b/tests/expectations/derive_ostream.both.compat.c
similarity index 100%
rename from tests/expectations/both/derive_ostream.compat.c
rename to tests/expectations/derive_ostream.both.compat.c
diff --git a/tests/expectations/tag/derive_ostream.c b/tests/expectations/derive_ostream.tag.c
similarity index 100%
rename from tests/expectations/tag/derive_ostream.c
rename to tests/expectations/derive_ostream.tag.c
diff --git a/tests/expectations/tag/derive_ostream.compat.c b/tests/expectations/derive_ostream.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/derive_ostream.compat.c
rename to tests/expectations/derive_ostream.tag.compat.c
diff --git a/tests/expectations/both/destructor-and-copy-ctor.c b/tests/expectations/destructor-and-copy-ctor.both.c
similarity index 100%
rename from tests/expectations/both/destructor-and-copy-ctor.c
rename to tests/expectations/destructor-and-copy-ctor.both.c
diff --git a/tests/expectations/both/destructor-and-copy-ctor.compat.c b/tests/expectations/destructor-and-copy-ctor.both.compat.c
similarity index 100%
rename from tests/expectations/both/destructor-and-copy-ctor.compat.c
rename to tests/expectations/destructor-and-copy-ctor.both.compat.c
diff --git a/tests/expectations/tag/destructor-and-copy-ctor.c b/tests/expectations/destructor-and-copy-ctor.tag.c
similarity index 100%
rename from tests/expectations/tag/destructor-and-copy-ctor.c
rename to tests/expectations/destructor-and-copy-ctor.tag.c
diff --git a/tests/expectations/tag/destructor-and-copy-ctor.compat.c b/tests/expectations/destructor-and-copy-ctor.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/destructor-and-copy-ctor.compat.c
rename to tests/expectations/destructor-and-copy-ctor.tag.compat.c
diff --git a/tests/expectations/both/display_list.c b/tests/expectations/display_list.both.c
similarity index 100%
rename from tests/expectations/both/display_list.c
rename to tests/expectations/display_list.both.c
diff --git a/tests/expectations/both/display_list.compat.c b/tests/expectations/display_list.both.compat.c
similarity index 100%
rename from tests/expectations/both/display_list.compat.c
rename to tests/expectations/display_list.both.compat.c
diff --git a/tests/expectations/tag/display_list.c b/tests/expectations/display_list.tag.c
similarity index 100%
rename from tests/expectations/tag/display_list.c
rename to tests/expectations/display_list.tag.c
diff --git a/tests/expectations/tag/display_list.compat.c b/tests/expectations/display_list.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/display_list.compat.c
rename to tests/expectations/display_list.tag.compat.c
diff --git a/tests/expectations/both/docstyle_auto.c b/tests/expectations/docstyle_auto.both.c
similarity index 100%
rename from tests/expectations/both/docstyle_auto.c
rename to tests/expectations/docstyle_auto.both.c
diff --git a/tests/expectations/both/docstyle_auto.compat.c b/tests/expectations/docstyle_auto.both.compat.c
similarity index 100%
rename from tests/expectations/both/docstyle_auto.compat.c
rename to tests/expectations/docstyle_auto.both.compat.c
diff --git a/tests/expectations/both/docstyle_doxy.c b/tests/expectations/docstyle_auto.tag.c
similarity index 100%
rename from tests/expectations/both/docstyle_doxy.c
rename to tests/expectations/docstyle_auto.tag.c
diff --git a/tests/expectations/both/docstyle_doxy.compat.c b/tests/expectations/docstyle_auto.tag.compat.c
similarity index 100%
rename from tests/expectations/both/docstyle_doxy.compat.c
rename to tests/expectations/docstyle_auto.tag.compat.c
diff --git a/tests/expectations/both/docstyle_c99.c b/tests/expectations/docstyle_c99.both.c
similarity index 100%
rename from tests/expectations/both/docstyle_c99.c
rename to tests/expectations/docstyle_c99.both.c
diff --git a/tests/expectations/both/docstyle_c99.compat.c b/tests/expectations/docstyle_c99.both.compat.c
similarity index 100%
rename from tests/expectations/both/docstyle_c99.compat.c
rename to tests/expectations/docstyle_c99.both.compat.c
diff --git a/tests/expectations/tag/docstyle_c99.c b/tests/expectations/docstyle_c99.tag.c
similarity index 100%
rename from tests/expectations/tag/docstyle_c99.c
rename to tests/expectations/docstyle_c99.tag.c
diff --git a/tests/expectations/tag/docstyle_c99.compat.c b/tests/expectations/docstyle_c99.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/docstyle_c99.compat.c
rename to tests/expectations/docstyle_c99.tag.compat.c
diff --git a/tests/expectations/tag/docstyle_auto.c b/tests/expectations/docstyle_doxy.both.c
similarity index 100%
rename from tests/expectations/tag/docstyle_auto.c
rename to tests/expectations/docstyle_doxy.both.c
diff --git a/tests/expectations/tag/docstyle_auto.compat.c b/tests/expectations/docstyle_doxy.both.compat.c
similarity index 100%
rename from tests/expectations/tag/docstyle_auto.compat.c
rename to tests/expectations/docstyle_doxy.both.compat.c
diff --git a/tests/expectations/tag/docstyle_doxy.c b/tests/expectations/docstyle_doxy.tag.c
similarity index 100%
rename from tests/expectations/tag/docstyle_doxy.c
rename to tests/expectations/docstyle_doxy.tag.c
diff --git a/tests/expectations/tag/docstyle_doxy.compat.c b/tests/expectations/docstyle_doxy.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/docstyle_doxy.compat.c
rename to tests/expectations/docstyle_doxy.tag.compat.c
diff --git a/tests/expectations/both/documentation.c b/tests/expectations/documentation.both.c
similarity index 100%
rename from tests/expectations/both/documentation.c
rename to tests/expectations/documentation.both.c
diff --git a/tests/expectations/both/documentation.compat.c b/tests/expectations/documentation.both.compat.c
similarity index 100%
rename from tests/expectations/both/documentation.compat.c
rename to tests/expectations/documentation.both.compat.c
diff --git a/tests/expectations/tag/documentation.c b/tests/expectations/documentation.tag.c
similarity index 100%
rename from tests/expectations/tag/documentation.c
rename to tests/expectations/documentation.tag.c
diff --git a/tests/expectations/tag/documentation.compat.c b/tests/expectations/documentation.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/documentation.compat.c
rename to tests/expectations/documentation.tag.compat.c
diff --git a/tests/expectations/both/documentation_attr.c b/tests/expectations/documentation_attr.both.c
similarity index 100%
rename from tests/expectations/both/documentation_attr.c
rename to tests/expectations/documentation_attr.both.c
diff --git a/tests/expectations/both/documentation_attr.compat.c b/tests/expectations/documentation_attr.both.compat.c
similarity index 100%
rename from tests/expectations/both/documentation_attr.compat.c
rename to tests/expectations/documentation_attr.both.compat.c
diff --git a/tests/expectations/tag/documentation_attr.c b/tests/expectations/documentation_attr.tag.c
similarity index 100%
rename from tests/expectations/tag/documentation_attr.c
rename to tests/expectations/documentation_attr.tag.c
diff --git a/tests/expectations/tag/documentation_attr.compat.c b/tests/expectations/documentation_attr.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/documentation_attr.compat.c
rename to tests/expectations/documentation_attr.tag.compat.c
diff --git a/tests/expectations/both/enum.c b/tests/expectations/enum.both.c
similarity index 100%
rename from tests/expectations/both/enum.c
rename to tests/expectations/enum.both.c
diff --git a/tests/expectations/both/enum.compat.c b/tests/expectations/enum.both.compat.c
similarity index 100%
rename from tests/expectations/both/enum.compat.c
rename to tests/expectations/enum.both.compat.c
diff --git a/tests/expectations/tag/enum.c b/tests/expectations/enum.tag.c
similarity index 100%
rename from tests/expectations/tag/enum.c
rename to tests/expectations/enum.tag.c
diff --git a/tests/expectations/tag/enum.compat.c b/tests/expectations/enum.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/enum.compat.c
rename to tests/expectations/enum.tag.compat.c
diff --git a/tests/expectations/both/enum_self.c b/tests/expectations/enum_self.both.c
similarity index 100%
rename from tests/expectations/both/enum_self.c
rename to tests/expectations/enum_self.both.c
diff --git a/tests/expectations/both/enum_self.compat.c b/tests/expectations/enum_self.both.compat.c
similarity index 100%
rename from tests/expectations/both/enum_self.compat.c
rename to tests/expectations/enum_self.both.compat.c
diff --git a/tests/expectations/tag/enum_self.c b/tests/expectations/enum_self.tag.c
similarity index 100%
rename from tests/expectations/tag/enum_self.c
rename to tests/expectations/enum_self.tag.c
diff --git a/tests/expectations/tag/enum_self.compat.c b/tests/expectations/enum_self.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/enum_self.compat.c
rename to tests/expectations/enum_self.tag.compat.c
diff --git a/tests/expectations/both/euclid.c b/tests/expectations/euclid.both.c
similarity index 100%
rename from tests/expectations/both/euclid.c
rename to tests/expectations/euclid.both.c
diff --git a/tests/expectations/both/euclid.compat.c b/tests/expectations/euclid.both.compat.c
similarity index 100%
rename from tests/expectations/both/euclid.compat.c
rename to tests/expectations/euclid.both.compat.c
diff --git a/tests/expectations/tag/euclid.c b/tests/expectations/euclid.tag.c
similarity index 100%
rename from tests/expectations/tag/euclid.c
rename to tests/expectations/euclid.tag.c
diff --git a/tests/expectations/tag/euclid.compat.c b/tests/expectations/euclid.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/euclid.compat.c
rename to tests/expectations/euclid.tag.compat.c
diff --git a/tests/expectations/both/exclude_generic_monomorph.c b/tests/expectations/exclude_generic_monomorph.both.c
similarity index 100%
rename from tests/expectations/both/exclude_generic_monomorph.c
rename to tests/expectations/exclude_generic_monomorph.both.c
diff --git a/tests/expectations/both/exclude_generic_monomorph.compat.c b/tests/expectations/exclude_generic_monomorph.both.compat.c
similarity index 100%
rename from tests/expectations/both/exclude_generic_monomorph.compat.c
rename to tests/expectations/exclude_generic_monomorph.both.compat.c
diff --git a/tests/expectations/tag/exclude_generic_monomorph.c b/tests/expectations/exclude_generic_monomorph.tag.c
similarity index 100%
rename from tests/expectations/tag/exclude_generic_monomorph.c
rename to tests/expectations/exclude_generic_monomorph.tag.c
diff --git a/tests/expectations/tag/exclude_generic_monomorph.compat.c b/tests/expectations/exclude_generic_monomorph.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/exclude_generic_monomorph.compat.c
rename to tests/expectations/exclude_generic_monomorph.tag.compat.c
diff --git a/tests/expectations/both/expand.c b/tests/expectations/expand.both.c
similarity index 100%
rename from tests/expectations/both/expand.c
rename to tests/expectations/expand.both.c
diff --git a/tests/expectations/both/expand.compat.c b/tests/expectations/expand.both.compat.c
similarity index 100%
rename from tests/expectations/both/expand.compat.c
rename to tests/expectations/expand.both.compat.c
diff --git a/tests/expectations/tag/expand.c b/tests/expectations/expand.tag.c
similarity index 100%
rename from tests/expectations/tag/expand.c
rename to tests/expectations/expand.tag.c
diff --git a/tests/expectations/tag/expand.compat.c b/tests/expectations/expand.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/expand.compat.c
rename to tests/expectations/expand.tag.compat.c
diff --git a/tests/expectations/both/expand_default_features.c b/tests/expectations/expand_default_features.both.c
similarity index 100%
rename from tests/expectations/both/expand_default_features.c
rename to tests/expectations/expand_default_features.both.c
diff --git a/tests/expectations/both/expand_default_features.compat.c b/tests/expectations/expand_default_features.both.compat.c
similarity index 100%
rename from tests/expectations/both/expand_default_features.compat.c
rename to tests/expectations/expand_default_features.both.compat.c
diff --git a/tests/expectations/tag/expand_default_features.c b/tests/expectations/expand_default_features.tag.c
similarity index 100%
rename from tests/expectations/tag/expand_default_features.c
rename to tests/expectations/expand_default_features.tag.c
diff --git a/tests/expectations/tag/expand_default_features.compat.c b/tests/expectations/expand_default_features.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/expand_default_features.compat.c
rename to tests/expectations/expand_default_features.tag.compat.c
diff --git a/tests/expectations/both/expand_dep.c b/tests/expectations/expand_dep.both.c
similarity index 100%
rename from tests/expectations/both/expand_dep.c
rename to tests/expectations/expand_dep.both.c
diff --git a/tests/expectations/both/expand_dep.compat.c b/tests/expectations/expand_dep.both.compat.c
similarity index 100%
rename from tests/expectations/both/expand_dep.compat.c
rename to tests/expectations/expand_dep.both.compat.c
diff --git a/tests/expectations/tag/expand_dep.c b/tests/expectations/expand_dep.tag.c
similarity index 100%
rename from tests/expectations/tag/expand_dep.c
rename to tests/expectations/expand_dep.tag.c
diff --git a/tests/expectations/tag/expand_dep.compat.c b/tests/expectations/expand_dep.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/expand_dep.compat.c
rename to tests/expectations/expand_dep.tag.compat.c
diff --git a/tests/expectations/both/expand_dep_v2.c b/tests/expectations/expand_dep_v2.both.c
similarity index 100%
rename from tests/expectations/both/expand_dep_v2.c
rename to tests/expectations/expand_dep_v2.both.c
diff --git a/tests/expectations/both/expand_dep_v2.compat.c b/tests/expectations/expand_dep_v2.both.compat.c
similarity index 100%
rename from tests/expectations/both/expand_dep_v2.compat.c
rename to tests/expectations/expand_dep_v2.both.compat.c
diff --git a/tests/expectations/tag/expand_dep_v2.c b/tests/expectations/expand_dep_v2.tag.c
similarity index 100%
rename from tests/expectations/tag/expand_dep_v2.c
rename to tests/expectations/expand_dep_v2.tag.c
diff --git a/tests/expectations/tag/expand_dep_v2.compat.c b/tests/expectations/expand_dep_v2.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/expand_dep_v2.compat.c
rename to tests/expectations/expand_dep_v2.tag.compat.c
diff --git a/tests/expectations/both/expand_features.c b/tests/expectations/expand_features.both.c
similarity index 100%
rename from tests/expectations/both/expand_features.c
rename to tests/expectations/expand_features.both.c
diff --git a/tests/expectations/both/expand_features.compat.c b/tests/expectations/expand_features.both.compat.c
similarity index 100%
rename from tests/expectations/both/expand_features.compat.c
rename to tests/expectations/expand_features.both.compat.c
diff --git a/tests/expectations/tag/expand_features.c b/tests/expectations/expand_features.tag.c
similarity index 100%
rename from tests/expectations/tag/expand_features.c
rename to tests/expectations/expand_features.tag.c
diff --git a/tests/expectations/tag/expand_features.compat.c b/tests/expectations/expand_features.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/expand_features.compat.c
rename to tests/expectations/expand_features.tag.compat.c
diff --git a/tests/expectations/both/expand_no_default_features.c b/tests/expectations/expand_no_default_features.both.c
similarity index 100%
rename from tests/expectations/both/expand_no_default_features.c
rename to tests/expectations/expand_no_default_features.both.c
diff --git a/tests/expectations/both/expand_no_default_features.compat.c b/tests/expectations/expand_no_default_features.both.compat.c
similarity index 100%
rename from tests/expectations/both/expand_no_default_features.compat.c
rename to tests/expectations/expand_no_default_features.both.compat.c
diff --git a/tests/expectations/tag/expand_no_default_features.c b/tests/expectations/expand_no_default_features.tag.c
similarity index 100%
rename from tests/expectations/tag/expand_no_default_features.c
rename to tests/expectations/expand_no_default_features.tag.c
diff --git a/tests/expectations/tag/expand_no_default_features.compat.c b/tests/expectations/expand_no_default_features.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/expand_no_default_features.compat.c
rename to tests/expectations/expand_no_default_features.tag.compat.c
diff --git a/tests/expectations/both/export_name.c b/tests/expectations/export_name.both.c
similarity index 100%
rename from tests/expectations/both/export_name.c
rename to tests/expectations/export_name.both.c
diff --git a/tests/expectations/both/export_name.compat.c b/tests/expectations/export_name.both.compat.c
similarity index 100%
rename from tests/expectations/both/export_name.compat.c
rename to tests/expectations/export_name.both.compat.c
diff --git a/tests/expectations/tag/export_name.c b/tests/expectations/export_name.tag.c
similarity index 100%
rename from tests/expectations/tag/export_name.c
rename to tests/expectations/export_name.tag.c
diff --git a/tests/expectations/tag/export_name.compat.c b/tests/expectations/export_name.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/export_name.compat.c
rename to tests/expectations/export_name.tag.compat.c
diff --git a/tests/expectations/both/extern-2.c b/tests/expectations/extern-2.both.c
similarity index 100%
rename from tests/expectations/both/extern-2.c
rename to tests/expectations/extern-2.both.c
diff --git a/tests/expectations/both/extern-2.compat.c b/tests/expectations/extern-2.both.compat.c
similarity index 100%
rename from tests/expectations/both/extern-2.compat.c
rename to tests/expectations/extern-2.both.compat.c
diff --git a/tests/expectations/tag/extern-2.c b/tests/expectations/extern-2.tag.c
similarity index 100%
rename from tests/expectations/tag/extern-2.c
rename to tests/expectations/extern-2.tag.c
diff --git a/tests/expectations/tag/extern-2.compat.c b/tests/expectations/extern-2.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/extern-2.compat.c
rename to tests/expectations/extern-2.tag.compat.c
diff --git a/tests/expectations/both/extern.c b/tests/expectations/extern.both.c
similarity index 100%
rename from tests/expectations/both/extern.c
rename to tests/expectations/extern.both.c
diff --git a/tests/expectations/both/extern.compat.c b/tests/expectations/extern.both.compat.c
similarity index 100%
rename from tests/expectations/both/extern.compat.c
rename to tests/expectations/extern.both.compat.c
diff --git a/tests/expectations/tag/extern.c b/tests/expectations/extern.tag.c
similarity index 100%
rename from tests/expectations/tag/extern.c
rename to tests/expectations/extern.tag.c
diff --git a/tests/expectations/tag/extern.compat.c b/tests/expectations/extern.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/extern.compat.c
rename to tests/expectations/extern.tag.compat.c
diff --git a/tests/expectations/both/external_workspace_child.c b/tests/expectations/external_workspace_child.both.c
similarity index 100%
rename from tests/expectations/both/external_workspace_child.c
rename to tests/expectations/external_workspace_child.both.c
diff --git a/tests/expectations/both/external_workspace_child.compat.c b/tests/expectations/external_workspace_child.both.compat.c
similarity index 100%
rename from tests/expectations/both/external_workspace_child.compat.c
rename to tests/expectations/external_workspace_child.both.compat.c
diff --git a/tests/expectations/tag/external_workspace_child.c b/tests/expectations/external_workspace_child.tag.c
similarity index 100%
rename from tests/expectations/tag/external_workspace_child.c
rename to tests/expectations/external_workspace_child.tag.c
diff --git a/tests/expectations/tag/external_workspace_child.compat.c b/tests/expectations/external_workspace_child.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/external_workspace_child.compat.c
rename to tests/expectations/external_workspace_child.tag.compat.c
diff --git a/tests/expectations/both/fns.c b/tests/expectations/fns.both.c
similarity index 100%
rename from tests/expectations/both/fns.c
rename to tests/expectations/fns.both.c
diff --git a/tests/expectations/both/fns.compat.c b/tests/expectations/fns.both.compat.c
similarity index 100%
rename from tests/expectations/both/fns.compat.c
rename to tests/expectations/fns.both.compat.c
diff --git a/tests/expectations/tag/fns.c b/tests/expectations/fns.tag.c
similarity index 100%
rename from tests/expectations/tag/fns.c
rename to tests/expectations/fns.tag.c
diff --git a/tests/expectations/tag/fns.compat.c b/tests/expectations/fns.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/fns.compat.c
rename to tests/expectations/fns.tag.compat.c
diff --git a/tests/expectations/both/function_args.c b/tests/expectations/function_args.both.c
similarity index 100%
rename from tests/expectations/both/function_args.c
rename to tests/expectations/function_args.both.c
diff --git a/tests/expectations/both/function_args.compat.c b/tests/expectations/function_args.both.compat.c
similarity index 100%
rename from tests/expectations/both/function_args.compat.c
rename to tests/expectations/function_args.both.compat.c
diff --git a/tests/expectations/tag/function_args.c b/tests/expectations/function_args.tag.c
similarity index 100%
rename from tests/expectations/tag/function_args.c
rename to tests/expectations/function_args.tag.c
diff --git a/tests/expectations/tag/function_args.compat.c b/tests/expectations/function_args.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/function_args.compat.c
rename to tests/expectations/function_args.tag.compat.c
diff --git a/tests/expectations/both/function_noreturn.c b/tests/expectations/function_noreturn.both.c
similarity index 100%
rename from tests/expectations/both/function_noreturn.c
rename to tests/expectations/function_noreturn.both.c
diff --git a/tests/expectations/both/function_noreturn.compat.c b/tests/expectations/function_noreturn.both.compat.c
similarity index 100%
rename from tests/expectations/both/function_noreturn.compat.c
rename to tests/expectations/function_noreturn.both.compat.c
diff --git a/tests/expectations/tag/function_noreturn.c b/tests/expectations/function_noreturn.tag.c
similarity index 100%
rename from tests/expectations/tag/function_noreturn.c
rename to tests/expectations/function_noreturn.tag.c
diff --git a/tests/expectations/tag/function_noreturn.compat.c b/tests/expectations/function_noreturn.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/function_noreturn.compat.c
rename to tests/expectations/function_noreturn.tag.compat.c
diff --git a/tests/expectations/both/function_sort_name.c b/tests/expectations/function_sort_name.both.c
similarity index 100%
rename from tests/expectations/both/function_sort_name.c
rename to tests/expectations/function_sort_name.both.c
diff --git a/tests/expectations/both/function_sort_name.compat.c b/tests/expectations/function_sort_name.both.compat.c
similarity index 100%
rename from tests/expectations/both/function_sort_name.compat.c
rename to tests/expectations/function_sort_name.both.compat.c
diff --git a/tests/expectations/tag/function_sort_name.c b/tests/expectations/function_sort_name.tag.c
similarity index 100%
rename from tests/expectations/tag/function_sort_name.c
rename to tests/expectations/function_sort_name.tag.c
diff --git a/tests/expectations/tag/function_sort_name.compat.c b/tests/expectations/function_sort_name.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/function_sort_name.compat.c
rename to tests/expectations/function_sort_name.tag.compat.c
diff --git a/tests/expectations/both/function_sort_none.c b/tests/expectations/function_sort_none.both.c
similarity index 100%
rename from tests/expectations/both/function_sort_none.c
rename to tests/expectations/function_sort_none.both.c
diff --git a/tests/expectations/both/function_sort_none.compat.c b/tests/expectations/function_sort_none.both.compat.c
similarity index 100%
rename from tests/expectations/both/function_sort_none.compat.c
rename to tests/expectations/function_sort_none.both.compat.c
diff --git a/tests/expectations/tag/function_sort_none.c b/tests/expectations/function_sort_none.tag.c
similarity index 100%
rename from tests/expectations/tag/function_sort_none.c
rename to tests/expectations/function_sort_none.tag.c
diff --git a/tests/expectations/tag/function_sort_none.compat.c b/tests/expectations/function_sort_none.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/function_sort_none.compat.c
rename to tests/expectations/function_sort_none.tag.compat.c
diff --git a/tests/expectations/both/generic-pointer.c b/tests/expectations/generic-pointer.both.c
similarity index 100%
rename from tests/expectations/both/generic-pointer.c
rename to tests/expectations/generic-pointer.both.c
diff --git a/tests/expectations/both/generic-pointer.compat.c b/tests/expectations/generic-pointer.both.compat.c
similarity index 100%
rename from tests/expectations/both/generic-pointer.compat.c
rename to tests/expectations/generic-pointer.both.compat.c
diff --git a/tests/expectations/tag/generic-pointer.c b/tests/expectations/generic-pointer.tag.c
similarity index 100%
rename from tests/expectations/tag/generic-pointer.c
rename to tests/expectations/generic-pointer.tag.c
diff --git a/tests/expectations/tag/generic-pointer.compat.c b/tests/expectations/generic-pointer.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/generic-pointer.compat.c
rename to tests/expectations/generic-pointer.tag.compat.c
diff --git a/tests/expectations/both/nested_import.c b/tests/expectations/global_attr.both.c
similarity index 100%
rename from tests/expectations/both/nested_import.c
rename to tests/expectations/global_attr.both.c
diff --git a/tests/expectations/both/nested_import.compat.c b/tests/expectations/global_attr.both.compat.c
similarity index 100%
rename from tests/expectations/both/nested_import.compat.c
rename to tests/expectations/global_attr.both.compat.c
diff --git a/tests/expectations/both/style-crash.c b/tests/expectations/global_attr.tag.c
similarity index 100%
rename from tests/expectations/both/style-crash.c
rename to tests/expectations/global_attr.tag.c
diff --git a/tests/expectations/both/style-crash.compat.c b/tests/expectations/global_attr.tag.compat.c
similarity index 100%
rename from tests/expectations/both/style-crash.compat.c
rename to tests/expectations/global_attr.tag.compat.c
diff --git a/tests/expectations/both/global_variable.c b/tests/expectations/global_variable.both.c
similarity index 100%
rename from tests/expectations/both/global_variable.c
rename to tests/expectations/global_variable.both.c
diff --git a/tests/expectations/both/global_variable.compat.c b/tests/expectations/global_variable.both.compat.c
similarity index 100%
rename from tests/expectations/both/global_variable.compat.c
rename to tests/expectations/global_variable.both.compat.c
diff --git a/tests/expectations/tag/global_variable.c b/tests/expectations/global_variable.tag.c
similarity index 100%
rename from tests/expectations/tag/global_variable.c
rename to tests/expectations/global_variable.tag.c
diff --git a/tests/expectations/tag/global_variable.compat.c b/tests/expectations/global_variable.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/global_variable.compat.c
rename to tests/expectations/global_variable.tag.compat.c
diff --git a/tests/expectations/both/ignore.c b/tests/expectations/ignore.both.c
similarity index 100%
rename from tests/expectations/both/ignore.c
rename to tests/expectations/ignore.both.c
diff --git a/tests/expectations/both/ignore.compat.c b/tests/expectations/ignore.both.compat.c
similarity index 100%
rename from tests/expectations/both/ignore.compat.c
rename to tests/expectations/ignore.both.compat.c
diff --git a/tests/expectations/tag/ignore.c b/tests/expectations/ignore.tag.c
similarity index 100%
rename from tests/expectations/tag/ignore.c
rename to tests/expectations/ignore.tag.c
diff --git a/tests/expectations/tag/ignore.compat.c b/tests/expectations/ignore.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/ignore.compat.c
rename to tests/expectations/ignore.tag.compat.c
diff --git a/tests/expectations/both/include.c b/tests/expectations/include.both.c
similarity index 100%
rename from tests/expectations/both/include.c
rename to tests/expectations/include.both.c
diff --git a/tests/expectations/both/include.compat.c b/tests/expectations/include.both.compat.c
similarity index 100%
rename from tests/expectations/both/include.compat.c
rename to tests/expectations/include.both.compat.c
diff --git a/tests/expectations/tag/include.c b/tests/expectations/include.tag.c
similarity index 100%
rename from tests/expectations/tag/include.c
rename to tests/expectations/include.tag.c
diff --git a/tests/expectations/tag/include.compat.c b/tests/expectations/include.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/include.compat.c
rename to tests/expectations/include.tag.compat.c
diff --git a/tests/expectations/both/include_guard.c b/tests/expectations/include_guard.both.c
similarity index 100%
rename from tests/expectations/both/include_guard.c
rename to tests/expectations/include_guard.both.c
diff --git a/tests/expectations/both/include_guard.compat.c b/tests/expectations/include_guard.both.compat.c
similarity index 100%
rename from tests/expectations/both/include_guard.compat.c
rename to tests/expectations/include_guard.both.compat.c
diff --git a/tests/expectations/tag/include_guard.c b/tests/expectations/include_guard.tag.c
similarity index 100%
rename from tests/expectations/tag/include_guard.c
rename to tests/expectations/include_guard.tag.c
diff --git a/tests/expectations/tag/include_guard.compat.c b/tests/expectations/include_guard.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/include_guard.compat.c
rename to tests/expectations/include_guard.tag.compat.c
diff --git a/tests/expectations/both/include_item.c b/tests/expectations/include_item.both.c
similarity index 100%
rename from tests/expectations/both/include_item.c
rename to tests/expectations/include_item.both.c
diff --git a/tests/expectations/both/include_item.compat.c b/tests/expectations/include_item.both.compat.c
similarity index 100%
rename from tests/expectations/both/include_item.compat.c
rename to tests/expectations/include_item.both.compat.c
diff --git a/tests/expectations/tag/include_item.c b/tests/expectations/include_item.tag.c
similarity index 100%
rename from tests/expectations/tag/include_item.c
rename to tests/expectations/include_item.tag.c
diff --git a/tests/expectations/tag/include_item.compat.c b/tests/expectations/include_item.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/include_item.compat.c
rename to tests/expectations/include_item.tag.compat.c
diff --git a/tests/expectations/both/include_specific.c b/tests/expectations/include_specific.both.c
similarity index 100%
rename from tests/expectations/both/include_specific.c
rename to tests/expectations/include_specific.both.c
diff --git a/tests/expectations/both/include_specific.compat.c b/tests/expectations/include_specific.both.compat.c
similarity index 100%
rename from tests/expectations/both/include_specific.compat.c
rename to tests/expectations/include_specific.both.compat.c
diff --git a/tests/expectations/tag/include_specific.c b/tests/expectations/include_specific.tag.c
similarity index 100%
rename from tests/expectations/tag/include_specific.c
rename to tests/expectations/include_specific.tag.c
diff --git a/tests/expectations/tag/include_specific.compat.c b/tests/expectations/include_specific.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/include_specific.compat.c
rename to tests/expectations/include_specific.tag.compat.c
diff --git a/tests/expectations/both/inner_mod.c b/tests/expectations/inner_mod.both.c
similarity index 100%
rename from tests/expectations/both/inner_mod.c
rename to tests/expectations/inner_mod.both.c
diff --git a/tests/expectations/both/inner_mod.compat.c b/tests/expectations/inner_mod.both.compat.c
similarity index 100%
rename from tests/expectations/both/inner_mod.compat.c
rename to tests/expectations/inner_mod.both.compat.c
diff --git a/tests/expectations/tag/inner_mod.c b/tests/expectations/inner_mod.tag.c
similarity index 100%
rename from tests/expectations/tag/inner_mod.c
rename to tests/expectations/inner_mod.tag.c
diff --git a/tests/expectations/tag/inner_mod.compat.c b/tests/expectations/inner_mod.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/inner_mod.compat.c
rename to tests/expectations/inner_mod.tag.compat.c
diff --git a/tests/expectations/both/item_types.c b/tests/expectations/item_types.both.c
similarity index 100%
rename from tests/expectations/both/item_types.c
rename to tests/expectations/item_types.both.c
diff --git a/tests/expectations/both/item_types.compat.c b/tests/expectations/item_types.both.compat.c
similarity index 100%
rename from tests/expectations/both/item_types.compat.c
rename to tests/expectations/item_types.both.compat.c
diff --git a/tests/expectations/tag/item_types.c b/tests/expectations/item_types.tag.c
similarity index 100%
rename from tests/expectations/tag/item_types.c
rename to tests/expectations/item_types.tag.c
diff --git a/tests/expectations/tag/item_types.compat.c b/tests/expectations/item_types.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/item_types.compat.c
rename to tests/expectations/item_types.tag.compat.c
diff --git a/tests/expectations/both/item_types_renamed.c b/tests/expectations/item_types_renamed.both.c
similarity index 100%
rename from tests/expectations/both/item_types_renamed.c
rename to tests/expectations/item_types_renamed.both.c
diff --git a/tests/expectations/both/item_types_renamed.compat.c b/tests/expectations/item_types_renamed.both.compat.c
similarity index 100%
rename from tests/expectations/both/item_types_renamed.compat.c
rename to tests/expectations/item_types_renamed.both.compat.c
diff --git a/tests/expectations/tag/item_types_renamed.c b/tests/expectations/item_types_renamed.tag.c
similarity index 100%
rename from tests/expectations/tag/item_types_renamed.c
rename to tests/expectations/item_types_renamed.tag.c
diff --git a/tests/expectations/tag/item_types_renamed.compat.c b/tests/expectations/item_types_renamed.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/item_types_renamed.compat.c
rename to tests/expectations/item_types_renamed.tag.compat.c
diff --git a/tests/expectations/both/layout.c b/tests/expectations/layout.both.c
similarity index 100%
rename from tests/expectations/both/layout.c
rename to tests/expectations/layout.both.c
diff --git a/tests/expectations/both/layout.compat.c b/tests/expectations/layout.both.compat.c
similarity index 100%
rename from tests/expectations/both/layout.compat.c
rename to tests/expectations/layout.both.compat.c
diff --git a/tests/expectations/tag/layout.c b/tests/expectations/layout.tag.c
similarity index 100%
rename from tests/expectations/tag/layout.c
rename to tests/expectations/layout.tag.c
diff --git a/tests/expectations/tag/layout.compat.c b/tests/expectations/layout.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/layout.compat.c
rename to tests/expectations/layout.tag.compat.c
diff --git a/tests/expectations/both/layout_aligned_opaque.c b/tests/expectations/layout_aligned_opaque.both.c
similarity index 100%
rename from tests/expectations/both/layout_aligned_opaque.c
rename to tests/expectations/layout_aligned_opaque.both.c
diff --git a/tests/expectations/both/layout_aligned_opaque.compat.c b/tests/expectations/layout_aligned_opaque.both.compat.c
similarity index 100%
rename from tests/expectations/both/layout_aligned_opaque.compat.c
rename to tests/expectations/layout_aligned_opaque.both.compat.c
diff --git a/tests/expectations/tag/layout_aligned_opaque.c b/tests/expectations/layout_aligned_opaque.tag.c
similarity index 100%
rename from tests/expectations/tag/layout_aligned_opaque.c
rename to tests/expectations/layout_aligned_opaque.tag.c
diff --git a/tests/expectations/tag/layout_aligned_opaque.compat.c b/tests/expectations/layout_aligned_opaque.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/layout_aligned_opaque.compat.c
rename to tests/expectations/layout_aligned_opaque.tag.compat.c
diff --git a/tests/expectations/both/layout_packed_opaque.c b/tests/expectations/layout_packed_opaque.both.c
similarity index 100%
rename from tests/expectations/both/layout_packed_opaque.c
rename to tests/expectations/layout_packed_opaque.both.c
diff --git a/tests/expectations/both/layout_packed_opaque.compat.c b/tests/expectations/layout_packed_opaque.both.compat.c
similarity index 100%
rename from tests/expectations/both/layout_packed_opaque.compat.c
rename to tests/expectations/layout_packed_opaque.both.compat.c
diff --git a/tests/expectations/tag/layout_packed_opaque.c b/tests/expectations/layout_packed_opaque.tag.c
similarity index 100%
rename from tests/expectations/tag/layout_packed_opaque.c
rename to tests/expectations/layout_packed_opaque.tag.c
diff --git a/tests/expectations/tag/layout_packed_opaque.compat.c b/tests/expectations/layout_packed_opaque.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/layout_packed_opaque.compat.c
rename to tests/expectations/layout_packed_opaque.tag.compat.c
diff --git a/tests/expectations/both/lifetime_arg.c b/tests/expectations/lifetime_arg.both.c
similarity index 100%
rename from tests/expectations/both/lifetime_arg.c
rename to tests/expectations/lifetime_arg.both.c
diff --git a/tests/expectations/both/lifetime_arg.compat.c b/tests/expectations/lifetime_arg.both.compat.c
similarity index 100%
rename from tests/expectations/both/lifetime_arg.compat.c
rename to tests/expectations/lifetime_arg.both.compat.c
diff --git a/tests/expectations/tag/lifetime_arg.c b/tests/expectations/lifetime_arg.tag.c
similarity index 100%
rename from tests/expectations/tag/lifetime_arg.c
rename to tests/expectations/lifetime_arg.tag.c
diff --git a/tests/expectations/tag/lifetime_arg.compat.c b/tests/expectations/lifetime_arg.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/lifetime_arg.compat.c
rename to tests/expectations/lifetime_arg.tag.compat.c
diff --git a/tests/expectations/both/linestyle_cr.c b/tests/expectations/linestyle_cr.both.c
similarity index 100%
rename from tests/expectations/both/linestyle_cr.c
rename to tests/expectations/linestyle_cr.both.c
diff --git a/tests/expectations/both/linestyle_cr.compat.c b/tests/expectations/linestyle_cr.both.compat.c
similarity index 100%
rename from tests/expectations/both/linestyle_cr.compat.c
rename to tests/expectations/linestyle_cr.both.compat.c
diff --git a/tests/expectations/tag/linestyle_cr.c b/tests/expectations/linestyle_cr.tag.c
similarity index 100%
rename from tests/expectations/tag/linestyle_cr.c
rename to tests/expectations/linestyle_cr.tag.c
diff --git a/tests/expectations/tag/linestyle_cr.compat.c b/tests/expectations/linestyle_cr.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/linestyle_cr.compat.c
rename to tests/expectations/linestyle_cr.tag.compat.c
diff --git a/tests/expectations/both/linestyle_crlf.c b/tests/expectations/linestyle_crlf.both.c
similarity index 100%
rename from tests/expectations/both/linestyle_crlf.c
rename to tests/expectations/linestyle_crlf.both.c
diff --git a/tests/expectations/both/linestyle_crlf.compat.c b/tests/expectations/linestyle_crlf.both.compat.c
similarity index 100%
rename from tests/expectations/both/linestyle_crlf.compat.c
rename to tests/expectations/linestyle_crlf.both.compat.c
diff --git a/tests/expectations/tag/linestyle_crlf.c b/tests/expectations/linestyle_crlf.tag.c
similarity index 100%
rename from tests/expectations/tag/linestyle_crlf.c
rename to tests/expectations/linestyle_crlf.tag.c
diff --git a/tests/expectations/tag/linestyle_crlf.compat.c b/tests/expectations/linestyle_crlf.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/linestyle_crlf.compat.c
rename to tests/expectations/linestyle_crlf.tag.compat.c
diff --git a/tests/expectations/both/linestyle_lf.c b/tests/expectations/linestyle_lf.both.c
similarity index 100%
rename from tests/expectations/both/linestyle_lf.c
rename to tests/expectations/linestyle_lf.both.c
diff --git a/tests/expectations/both/linestyle_lf.compat.c b/tests/expectations/linestyle_lf.both.compat.c
similarity index 100%
rename from tests/expectations/both/linestyle_lf.compat.c
rename to tests/expectations/linestyle_lf.both.compat.c
diff --git a/tests/expectations/tag/linestyle_lf.c b/tests/expectations/linestyle_lf.tag.c
similarity index 100%
rename from tests/expectations/tag/linestyle_lf.c
rename to tests/expectations/linestyle_lf.tag.c
diff --git a/tests/expectations/tag/linestyle_lf.compat.c b/tests/expectations/linestyle_lf.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/linestyle_lf.compat.c
rename to tests/expectations/linestyle_lf.tag.compat.c
diff --git a/tests/expectations/tag/associated_constant_panic.c b/tests/expectations/literal_target.both.c
similarity index 100%
rename from tests/expectations/tag/associated_constant_panic.c
rename to tests/expectations/literal_target.both.c
diff --git a/tests/expectations/tag/associated_constant_panic.compat.c b/tests/expectations/literal_target.both.compat.c
similarity index 100%
rename from tests/expectations/tag/associated_constant_panic.compat.c
rename to tests/expectations/literal_target.both.compat.c
diff --git a/tests/expectations/tag/cfg-field.c b/tests/expectations/literal_target.tag.c
similarity index 100%
rename from tests/expectations/tag/cfg-field.c
rename to tests/expectations/literal_target.tag.c
diff --git a/tests/expectations/tag/cfg-field.compat.c b/tests/expectations/literal_target.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/cfg-field.compat.c
rename to tests/expectations/literal_target.tag.compat.c
diff --git a/tests/expectations/both/mangle.c b/tests/expectations/mangle.both.c
similarity index 100%
rename from tests/expectations/both/mangle.c
rename to tests/expectations/mangle.both.c
diff --git a/tests/expectations/both/mangle.compat.c b/tests/expectations/mangle.both.compat.c
similarity index 100%
rename from tests/expectations/both/mangle.compat.c
rename to tests/expectations/mangle.both.compat.c
diff --git a/tests/expectations/tag/mangle.c b/tests/expectations/mangle.tag.c
similarity index 100%
rename from tests/expectations/tag/mangle.c
rename to tests/expectations/mangle.tag.c
diff --git a/tests/expectations/tag/mangle.compat.c b/tests/expectations/mangle.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/mangle.compat.c
rename to tests/expectations/mangle.tag.compat.c
diff --git a/tests/expectations/both/manuallydrop.c b/tests/expectations/manuallydrop.both.c
similarity index 100%
rename from tests/expectations/both/manuallydrop.c
rename to tests/expectations/manuallydrop.both.c
diff --git a/tests/expectations/both/manuallydrop.compat.c b/tests/expectations/manuallydrop.both.compat.c
similarity index 100%
rename from tests/expectations/both/manuallydrop.compat.c
rename to tests/expectations/manuallydrop.both.compat.c
diff --git a/tests/expectations/tag/manuallydrop.c b/tests/expectations/manuallydrop.tag.c
similarity index 100%
rename from tests/expectations/tag/manuallydrop.c
rename to tests/expectations/manuallydrop.tag.c
diff --git a/tests/expectations/tag/manuallydrop.compat.c b/tests/expectations/manuallydrop.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/manuallydrop.compat.c
rename to tests/expectations/manuallydrop.tag.compat.c
diff --git a/tests/expectations/both/maybeuninit.c b/tests/expectations/maybeuninit.both.c
similarity index 100%
rename from tests/expectations/both/maybeuninit.c
rename to tests/expectations/maybeuninit.both.c
diff --git a/tests/expectations/both/maybeuninit.compat.c b/tests/expectations/maybeuninit.both.compat.c
similarity index 100%
rename from tests/expectations/both/maybeuninit.compat.c
rename to tests/expectations/maybeuninit.both.compat.c
diff --git a/tests/expectations/tag/maybeuninit.c b/tests/expectations/maybeuninit.tag.c
similarity index 100%
rename from tests/expectations/tag/maybeuninit.c
rename to tests/expectations/maybeuninit.tag.c
diff --git a/tests/expectations/tag/maybeuninit.compat.c b/tests/expectations/maybeuninit.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/maybeuninit.compat.c
rename to tests/expectations/maybeuninit.tag.compat.c
diff --git a/tests/expectations/both/mod_2015.c b/tests/expectations/mod_2015.both.c
similarity index 100%
rename from tests/expectations/both/mod_2015.c
rename to tests/expectations/mod_2015.both.c
diff --git a/tests/expectations/both/mod_2015.compat.c b/tests/expectations/mod_2015.both.compat.c
similarity index 100%
rename from tests/expectations/both/mod_2015.compat.c
rename to tests/expectations/mod_2015.both.compat.c
diff --git a/tests/expectations/tag/mod_2015.c b/tests/expectations/mod_2015.tag.c
similarity index 100%
rename from tests/expectations/tag/mod_2015.c
rename to tests/expectations/mod_2015.tag.c
diff --git a/tests/expectations/tag/mod_2015.compat.c b/tests/expectations/mod_2015.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/mod_2015.compat.c
rename to tests/expectations/mod_2015.tag.compat.c
diff --git a/tests/expectations/both/mod_2018.c b/tests/expectations/mod_2018.both.c
similarity index 100%
rename from tests/expectations/both/mod_2018.c
rename to tests/expectations/mod_2018.both.c
diff --git a/tests/expectations/both/mod_2018.compat.c b/tests/expectations/mod_2018.both.compat.c
similarity index 100%
rename from tests/expectations/both/mod_2018.compat.c
rename to tests/expectations/mod_2018.both.compat.c
diff --git a/tests/expectations/tag/mod_2018.c b/tests/expectations/mod_2018.tag.c
similarity index 100%
rename from tests/expectations/tag/mod_2018.c
rename to tests/expectations/mod_2018.tag.c
diff --git a/tests/expectations/tag/mod_2018.compat.c b/tests/expectations/mod_2018.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/mod_2018.compat.c
rename to tests/expectations/mod_2018.tag.compat.c
diff --git a/tests/expectations/both/mod_attr.c b/tests/expectations/mod_attr.both.c
similarity index 100%
rename from tests/expectations/both/mod_attr.c
rename to tests/expectations/mod_attr.both.c
diff --git a/tests/expectations/both/mod_attr.compat.c b/tests/expectations/mod_attr.both.compat.c
similarity index 100%
rename from tests/expectations/both/mod_attr.compat.c
rename to tests/expectations/mod_attr.both.compat.c
diff --git a/tests/expectations/tag/mod_attr.c b/tests/expectations/mod_attr.tag.c
similarity index 100%
rename from tests/expectations/tag/mod_attr.c
rename to tests/expectations/mod_attr.tag.c
diff --git a/tests/expectations/tag/mod_attr.compat.c b/tests/expectations/mod_attr.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/mod_attr.compat.c
rename to tests/expectations/mod_attr.tag.compat.c
diff --git a/tests/expectations/both/mod_path.c b/tests/expectations/mod_path.both.c
similarity index 100%
rename from tests/expectations/both/mod_path.c
rename to tests/expectations/mod_path.both.c
diff --git a/tests/expectations/both/mod_path.compat.c b/tests/expectations/mod_path.both.compat.c
similarity index 100%
rename from tests/expectations/both/mod_path.compat.c
rename to tests/expectations/mod_path.both.compat.c
diff --git a/tests/expectations/tag/mod_path.c b/tests/expectations/mod_path.tag.c
similarity index 100%
rename from tests/expectations/tag/mod_path.c
rename to tests/expectations/mod_path.tag.c
diff --git a/tests/expectations/tag/mod_path.compat.c b/tests/expectations/mod_path.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/mod_path.compat.c
rename to tests/expectations/mod_path.tag.compat.c
diff --git a/tests/expectations/both/monomorph-1.c b/tests/expectations/monomorph-1.both.c
similarity index 100%
rename from tests/expectations/both/monomorph-1.c
rename to tests/expectations/monomorph-1.both.c
diff --git a/tests/expectations/both/monomorph-1.compat.c b/tests/expectations/monomorph-1.both.compat.c
similarity index 100%
rename from tests/expectations/both/monomorph-1.compat.c
rename to tests/expectations/monomorph-1.both.compat.c
diff --git a/tests/expectations/tag/monomorph-1.c b/tests/expectations/monomorph-1.tag.c
similarity index 100%
rename from tests/expectations/tag/monomorph-1.c
rename to tests/expectations/monomorph-1.tag.c
diff --git a/tests/expectations/tag/monomorph-1.compat.c b/tests/expectations/monomorph-1.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/monomorph-1.compat.c
rename to tests/expectations/monomorph-1.tag.compat.c
diff --git a/tests/expectations/both/monomorph-2.c b/tests/expectations/monomorph-2.both.c
similarity index 100%
rename from tests/expectations/both/monomorph-2.c
rename to tests/expectations/monomorph-2.both.c
diff --git a/tests/expectations/both/monomorph-2.compat.c b/tests/expectations/monomorph-2.both.compat.c
similarity index 100%
rename from tests/expectations/both/monomorph-2.compat.c
rename to tests/expectations/monomorph-2.both.compat.c
diff --git a/tests/expectations/tag/monomorph-2.c b/tests/expectations/monomorph-2.tag.c
similarity index 100%
rename from tests/expectations/tag/monomorph-2.c
rename to tests/expectations/monomorph-2.tag.c
diff --git a/tests/expectations/tag/monomorph-2.compat.c b/tests/expectations/monomorph-2.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/monomorph-2.compat.c
rename to tests/expectations/monomorph-2.tag.compat.c
diff --git a/tests/expectations/both/monomorph-3.c b/tests/expectations/monomorph-3.both.c
similarity index 100%
rename from tests/expectations/both/monomorph-3.c
rename to tests/expectations/monomorph-3.both.c
diff --git a/tests/expectations/both/monomorph-3.compat.c b/tests/expectations/monomorph-3.both.compat.c
similarity index 100%
rename from tests/expectations/both/monomorph-3.compat.c
rename to tests/expectations/monomorph-3.both.compat.c
diff --git a/tests/expectations/tag/monomorph-3.c b/tests/expectations/monomorph-3.tag.c
similarity index 100%
rename from tests/expectations/tag/monomorph-3.c
rename to tests/expectations/monomorph-3.tag.c
diff --git a/tests/expectations/tag/monomorph-3.compat.c b/tests/expectations/monomorph-3.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/monomorph-3.compat.c
rename to tests/expectations/monomorph-3.tag.compat.c
diff --git a/tests/expectations/both/must-use.c b/tests/expectations/must-use.both.c
similarity index 100%
rename from tests/expectations/both/must-use.c
rename to tests/expectations/must-use.both.c
diff --git a/tests/expectations/both/must-use.compat.c b/tests/expectations/must-use.both.compat.c
similarity index 100%
rename from tests/expectations/both/must-use.compat.c
rename to tests/expectations/must-use.both.compat.c
diff --git a/tests/expectations/tag/must-use.c b/tests/expectations/must-use.tag.c
similarity index 100%
rename from tests/expectations/tag/must-use.c
rename to tests/expectations/must-use.tag.c
diff --git a/tests/expectations/tag/must-use.compat.c b/tests/expectations/must-use.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/must-use.compat.c
rename to tests/expectations/must-use.tag.compat.c
diff --git a/tests/expectations/both/namespace_constant.c b/tests/expectations/namespace_constant.both.c
similarity index 100%
rename from tests/expectations/both/namespace_constant.c
rename to tests/expectations/namespace_constant.both.c
diff --git a/tests/expectations/both/namespace_constant.compat.c b/tests/expectations/namespace_constant.both.compat.c
similarity index 100%
rename from tests/expectations/both/namespace_constant.compat.c
rename to tests/expectations/namespace_constant.both.compat.c
diff --git a/tests/expectations/tag/namespace_constant.c b/tests/expectations/namespace_constant.tag.c
similarity index 100%
rename from tests/expectations/tag/namespace_constant.c
rename to tests/expectations/namespace_constant.tag.c
diff --git a/tests/expectations/tag/namespace_constant.compat.c b/tests/expectations/namespace_constant.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/namespace_constant.compat.c
rename to tests/expectations/namespace_constant.tag.compat.c
diff --git a/tests/expectations/both/namespaces_constant.c b/tests/expectations/namespaces_constant.both.c
similarity index 100%
rename from tests/expectations/both/namespaces_constant.c
rename to tests/expectations/namespaces_constant.both.c
diff --git a/tests/expectations/both/namespaces_constant.compat.c b/tests/expectations/namespaces_constant.both.compat.c
similarity index 100%
rename from tests/expectations/both/namespaces_constant.compat.c
rename to tests/expectations/namespaces_constant.both.compat.c
diff --git a/tests/expectations/tag/namespaces_constant.c b/tests/expectations/namespaces_constant.tag.c
similarity index 100%
rename from tests/expectations/tag/namespaces_constant.c
rename to tests/expectations/namespaces_constant.tag.c
diff --git a/tests/expectations/tag/namespaces_constant.compat.c b/tests/expectations/namespaces_constant.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/namespaces_constant.compat.c
rename to tests/expectations/namespaces_constant.tag.compat.c
diff --git a/tests/expectations/tag/global_attr.c b/tests/expectations/nested_import.both.c
similarity index 100%
rename from tests/expectations/tag/global_attr.c
rename to tests/expectations/nested_import.both.c
diff --git a/tests/expectations/tag/global_attr.compat.c b/tests/expectations/nested_import.both.compat.c
similarity index 100%
rename from tests/expectations/tag/global_attr.compat.c
rename to tests/expectations/nested_import.both.compat.c
diff --git a/tests/expectations/tag/literal_target.c b/tests/expectations/nested_import.tag.c
similarity index 100%
rename from tests/expectations/tag/literal_target.c
rename to tests/expectations/nested_import.tag.c
diff --git a/tests/expectations/tag/literal_target.compat.c b/tests/expectations/nested_import.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/literal_target.compat.c
rename to tests/expectations/nested_import.tag.compat.c
diff --git a/tests/expectations/both/no_includes.c b/tests/expectations/no_includes.both.c
similarity index 100%
rename from tests/expectations/both/no_includes.c
rename to tests/expectations/no_includes.both.c
diff --git a/tests/expectations/both/no_includes.compat.c b/tests/expectations/no_includes.both.compat.c
similarity index 100%
rename from tests/expectations/both/no_includes.compat.c
rename to tests/expectations/no_includes.both.compat.c
diff --git a/tests/expectations/tag/no_includes.c b/tests/expectations/no_includes.tag.c
similarity index 100%
rename from tests/expectations/tag/no_includes.c
rename to tests/expectations/no_includes.tag.c
diff --git a/tests/expectations/tag/no_includes.compat.c b/tests/expectations/no_includes.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/no_includes.compat.c
rename to tests/expectations/no_includes.tag.compat.c
diff --git a/tests/expectations/both/nonnull.c b/tests/expectations/nonnull.both.c
similarity index 100%
rename from tests/expectations/both/nonnull.c
rename to tests/expectations/nonnull.both.c
diff --git a/tests/expectations/both/nonnull.compat.c b/tests/expectations/nonnull.both.compat.c
similarity index 100%
rename from tests/expectations/both/nonnull.compat.c
rename to tests/expectations/nonnull.both.compat.c
diff --git a/tests/expectations/tag/nonnull.c b/tests/expectations/nonnull.tag.c
similarity index 100%
rename from tests/expectations/tag/nonnull.c
rename to tests/expectations/nonnull.tag.c
diff --git a/tests/expectations/tag/nonnull.compat.c b/tests/expectations/nonnull.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/nonnull.compat.c
rename to tests/expectations/nonnull.tag.compat.c
diff --git a/tests/expectations/both/nonnull_attribute.c b/tests/expectations/nonnull_attribute.both.c
similarity index 100%
rename from tests/expectations/both/nonnull_attribute.c
rename to tests/expectations/nonnull_attribute.both.c
diff --git a/tests/expectations/both/nonnull_attribute.compat.c b/tests/expectations/nonnull_attribute.both.compat.c
similarity index 100%
rename from tests/expectations/both/nonnull_attribute.compat.c
rename to tests/expectations/nonnull_attribute.both.compat.c
diff --git a/tests/expectations/tag/nonnull_attribute.c b/tests/expectations/nonnull_attribute.tag.c
similarity index 100%
rename from tests/expectations/tag/nonnull_attribute.c
rename to tests/expectations/nonnull_attribute.tag.c
diff --git a/tests/expectations/tag/nonnull_attribute.compat.c b/tests/expectations/nonnull_attribute.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/nonnull_attribute.compat.c
rename to tests/expectations/nonnull_attribute.tag.compat.c
diff --git a/tests/expectations/both/opaque.c b/tests/expectations/opaque.both.c
similarity index 100%
rename from tests/expectations/both/opaque.c
rename to tests/expectations/opaque.both.c
diff --git a/tests/expectations/both/opaque.compat.c b/tests/expectations/opaque.both.compat.c
similarity index 100%
rename from tests/expectations/both/opaque.compat.c
rename to tests/expectations/opaque.both.compat.c
diff --git a/tests/expectations/tag/opaque.c b/tests/expectations/opaque.tag.c
similarity index 100%
rename from tests/expectations/tag/opaque.c
rename to tests/expectations/opaque.tag.c
diff --git a/tests/expectations/tag/opaque.compat.c b/tests/expectations/opaque.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/opaque.compat.c
rename to tests/expectations/opaque.tag.compat.c
diff --git a/tests/expectations/both/pragma_once.c b/tests/expectations/pragma_once.both.c
similarity index 100%
rename from tests/expectations/both/pragma_once.c
rename to tests/expectations/pragma_once.both.c
diff --git a/tests/expectations/both/pragma_once.compat.c b/tests/expectations/pragma_once.both.compat.c
similarity index 100%
rename from tests/expectations/both/pragma_once.compat.c
rename to tests/expectations/pragma_once.both.compat.c
diff --git a/tests/expectations/tag/pragma_once.c b/tests/expectations/pragma_once.tag.c
similarity index 100%
rename from tests/expectations/tag/pragma_once.c
rename to tests/expectations/pragma_once.tag.c
diff --git a/tests/expectations/tag/pragma_once.compat.c b/tests/expectations/pragma_once.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/pragma_once.compat.c
rename to tests/expectations/pragma_once.tag.compat.c
diff --git a/tests/expectations/both/prefix.c b/tests/expectations/prefix.both.c
similarity index 100%
rename from tests/expectations/both/prefix.c
rename to tests/expectations/prefix.both.c
diff --git a/tests/expectations/both/prefix.compat.c b/tests/expectations/prefix.both.compat.c
similarity index 100%
rename from tests/expectations/both/prefix.compat.c
rename to tests/expectations/prefix.both.compat.c
diff --git a/tests/expectations/tag/prefix.c b/tests/expectations/prefix.tag.c
similarity index 100%
rename from tests/expectations/tag/prefix.c
rename to tests/expectations/prefix.tag.c
diff --git a/tests/expectations/tag/prefix.compat.c b/tests/expectations/prefix.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/prefix.compat.c
rename to tests/expectations/prefix.tag.compat.c
diff --git a/tests/expectations/both/prefixed_struct_literal.c b/tests/expectations/prefixed_struct_literal.both.c
similarity index 100%
rename from tests/expectations/both/prefixed_struct_literal.c
rename to tests/expectations/prefixed_struct_literal.both.c
diff --git a/tests/expectations/both/prefixed_struct_literal.compat.c b/tests/expectations/prefixed_struct_literal.both.compat.c
similarity index 100%
rename from tests/expectations/both/prefixed_struct_literal.compat.c
rename to tests/expectations/prefixed_struct_literal.both.compat.c
diff --git a/tests/expectations/tag/prefixed_struct_literal.c b/tests/expectations/prefixed_struct_literal.tag.c
similarity index 100%
rename from tests/expectations/tag/prefixed_struct_literal.c
rename to tests/expectations/prefixed_struct_literal.tag.c
diff --git a/tests/expectations/tag/prefixed_struct_literal.compat.c b/tests/expectations/prefixed_struct_literal.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/prefixed_struct_literal.compat.c
rename to tests/expectations/prefixed_struct_literal.tag.compat.c
diff --git a/tests/expectations/both/prefixed_struct_literal_deep.c b/tests/expectations/prefixed_struct_literal_deep.both.c
similarity index 100%
rename from tests/expectations/both/prefixed_struct_literal_deep.c
rename to tests/expectations/prefixed_struct_literal_deep.both.c
diff --git a/tests/expectations/both/prefixed_struct_literal_deep.compat.c b/tests/expectations/prefixed_struct_literal_deep.both.compat.c
similarity index 100%
rename from tests/expectations/both/prefixed_struct_literal_deep.compat.c
rename to tests/expectations/prefixed_struct_literal_deep.both.compat.c
diff --git a/tests/expectations/tag/prefixed_struct_literal_deep.c b/tests/expectations/prefixed_struct_literal_deep.tag.c
similarity index 100%
rename from tests/expectations/tag/prefixed_struct_literal_deep.c
rename to tests/expectations/prefixed_struct_literal_deep.tag.c
diff --git a/tests/expectations/tag/prefixed_struct_literal_deep.compat.c b/tests/expectations/prefixed_struct_literal_deep.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/prefixed_struct_literal_deep.compat.c
rename to tests/expectations/prefixed_struct_literal_deep.tag.compat.c
diff --git a/tests/expectations/both/ptrs_as_arrays.c b/tests/expectations/ptrs_as_arrays.both.c
similarity index 100%
rename from tests/expectations/both/ptrs_as_arrays.c
rename to tests/expectations/ptrs_as_arrays.both.c
diff --git a/tests/expectations/both/ptrs_as_arrays.compat.c b/tests/expectations/ptrs_as_arrays.both.compat.c
similarity index 100%
rename from tests/expectations/both/ptrs_as_arrays.compat.c
rename to tests/expectations/ptrs_as_arrays.both.compat.c
diff --git a/tests/expectations/tag/ptrs_as_arrays.c b/tests/expectations/ptrs_as_arrays.tag.c
similarity index 100%
rename from tests/expectations/tag/ptrs_as_arrays.c
rename to tests/expectations/ptrs_as_arrays.tag.c
diff --git a/tests/expectations/tag/ptrs_as_arrays.compat.c b/tests/expectations/ptrs_as_arrays.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/ptrs_as_arrays.compat.c
rename to tests/expectations/ptrs_as_arrays.tag.compat.c
diff --git a/tests/expectations/both/raw_lines.c b/tests/expectations/raw_lines.both.c
similarity index 100%
rename from tests/expectations/both/raw_lines.c
rename to tests/expectations/raw_lines.both.c
diff --git a/tests/expectations/both/raw_lines.compat.c b/tests/expectations/raw_lines.both.compat.c
similarity index 100%
rename from tests/expectations/both/raw_lines.compat.c
rename to tests/expectations/raw_lines.both.compat.c
diff --git a/tests/expectations/tag/raw_lines.c b/tests/expectations/raw_lines.tag.c
similarity index 100%
rename from tests/expectations/tag/raw_lines.c
rename to tests/expectations/raw_lines.tag.c
diff --git a/tests/expectations/tag/raw_lines.compat.c b/tests/expectations/raw_lines.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/raw_lines.compat.c
rename to tests/expectations/raw_lines.tag.compat.c
diff --git a/tests/expectations/both/rename-crate.c b/tests/expectations/rename-crate.both.c
similarity index 100%
rename from tests/expectations/both/rename-crate.c
rename to tests/expectations/rename-crate.both.c
diff --git a/tests/expectations/both/rename-crate.compat.c b/tests/expectations/rename-crate.both.compat.c
similarity index 100%
rename from tests/expectations/both/rename-crate.compat.c
rename to tests/expectations/rename-crate.both.compat.c
diff --git a/tests/expectations/tag/rename-crate.c b/tests/expectations/rename-crate.tag.c
similarity index 100%
rename from tests/expectations/tag/rename-crate.c
rename to tests/expectations/rename-crate.tag.c
diff --git a/tests/expectations/tag/rename-crate.compat.c b/tests/expectations/rename-crate.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/rename-crate.compat.c
rename to tests/expectations/rename-crate.tag.compat.c
diff --git a/tests/expectations/both/rename.c b/tests/expectations/rename.both.c
similarity index 100%
rename from tests/expectations/both/rename.c
rename to tests/expectations/rename.both.c
diff --git a/tests/expectations/both/rename.compat.c b/tests/expectations/rename.both.compat.c
similarity index 100%
rename from tests/expectations/both/rename.compat.c
rename to tests/expectations/rename.both.compat.c
diff --git a/tests/expectations/tag/rename.c b/tests/expectations/rename.tag.c
similarity index 100%
rename from tests/expectations/tag/rename.c
rename to tests/expectations/rename.tag.c
diff --git a/tests/expectations/tag/rename.compat.c b/tests/expectations/rename.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/rename.compat.c
rename to tests/expectations/rename.tag.compat.c
diff --git a/tests/expectations/both/renaming-overrides-prefixing.c b/tests/expectations/renaming-overrides-prefixing.both.c
similarity index 100%
rename from tests/expectations/both/renaming-overrides-prefixing.c
rename to tests/expectations/renaming-overrides-prefixing.both.c
diff --git a/tests/expectations/both/renaming-overrides-prefixing.compat.c b/tests/expectations/renaming-overrides-prefixing.both.compat.c
similarity index 100%
rename from tests/expectations/both/renaming-overrides-prefixing.compat.c
rename to tests/expectations/renaming-overrides-prefixing.both.compat.c
diff --git a/tests/expectations/tag/renaming-overrides-prefixing.c b/tests/expectations/renaming-overrides-prefixing.tag.c
similarity index 100%
rename from tests/expectations/tag/renaming-overrides-prefixing.c
rename to tests/expectations/renaming-overrides-prefixing.tag.c
diff --git a/tests/expectations/tag/renaming-overrides-prefixing.compat.c b/tests/expectations/renaming-overrides-prefixing.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/renaming-overrides-prefixing.compat.c
rename to tests/expectations/renaming-overrides-prefixing.tag.compat.c
diff --git a/tests/expectations/both/reserved.c b/tests/expectations/reserved.both.c
similarity index 100%
rename from tests/expectations/both/reserved.c
rename to tests/expectations/reserved.both.c
diff --git a/tests/expectations/both/reserved.compat.c b/tests/expectations/reserved.both.compat.c
similarity index 100%
rename from tests/expectations/both/reserved.compat.c
rename to tests/expectations/reserved.both.compat.c
diff --git a/tests/expectations/tag/reserved.c b/tests/expectations/reserved.tag.c
similarity index 100%
rename from tests/expectations/tag/reserved.c
rename to tests/expectations/reserved.tag.c
diff --git a/tests/expectations/tag/reserved.compat.c b/tests/expectations/reserved.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/reserved.compat.c
rename to tests/expectations/reserved.tag.compat.c
diff --git a/tests/expectations/both/sentinel.c b/tests/expectations/sentinel.both.c
similarity index 100%
rename from tests/expectations/both/sentinel.c
rename to tests/expectations/sentinel.both.c
diff --git a/tests/expectations/both/sentinel.compat.c b/tests/expectations/sentinel.both.compat.c
similarity index 100%
rename from tests/expectations/both/sentinel.compat.c
rename to tests/expectations/sentinel.both.compat.c
diff --git a/tests/expectations/tag/sentinel.c b/tests/expectations/sentinel.tag.c
similarity index 100%
rename from tests/expectations/tag/sentinel.c
rename to tests/expectations/sentinel.tag.c
diff --git a/tests/expectations/tag/sentinel.compat.c b/tests/expectations/sentinel.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/sentinel.compat.c
rename to tests/expectations/sentinel.tag.compat.c
diff --git a/tests/expectations/both/simplify-option-ptr.c b/tests/expectations/simplify-option-ptr.both.c
similarity index 100%
rename from tests/expectations/both/simplify-option-ptr.c
rename to tests/expectations/simplify-option-ptr.both.c
diff --git a/tests/expectations/both/simplify-option-ptr.compat.c b/tests/expectations/simplify-option-ptr.both.compat.c
similarity index 100%
rename from tests/expectations/both/simplify-option-ptr.compat.c
rename to tests/expectations/simplify-option-ptr.both.compat.c
diff --git a/tests/expectations/tag/simplify-option-ptr.c b/tests/expectations/simplify-option-ptr.tag.c
similarity index 100%
rename from tests/expectations/tag/simplify-option-ptr.c
rename to tests/expectations/simplify-option-ptr.tag.c
diff --git a/tests/expectations/tag/simplify-option-ptr.compat.c b/tests/expectations/simplify-option-ptr.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/simplify-option-ptr.compat.c
rename to tests/expectations/simplify-option-ptr.tag.compat.c
diff --git a/tests/expectations/both/static.c b/tests/expectations/static.both.c
similarity index 100%
rename from tests/expectations/both/static.c
rename to tests/expectations/static.both.c
diff --git a/tests/expectations/both/static.compat.c b/tests/expectations/static.both.compat.c
similarity index 100%
rename from tests/expectations/both/static.compat.c
rename to tests/expectations/static.both.compat.c
diff --git a/tests/expectations/tag/static.c b/tests/expectations/static.tag.c
similarity index 100%
rename from tests/expectations/tag/static.c
rename to tests/expectations/static.tag.c
diff --git a/tests/expectations/tag/static.compat.c b/tests/expectations/static.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/static.compat.c
rename to tests/expectations/static.tag.compat.c
diff --git a/tests/expectations/both/std_lib.c b/tests/expectations/std_lib.both.c
similarity index 100%
rename from tests/expectations/both/std_lib.c
rename to tests/expectations/std_lib.both.c
diff --git a/tests/expectations/both/std_lib.compat.c b/tests/expectations/std_lib.both.compat.c
similarity index 100%
rename from tests/expectations/both/std_lib.compat.c
rename to tests/expectations/std_lib.both.compat.c
diff --git a/tests/expectations/tag/std_lib.c b/tests/expectations/std_lib.tag.c
similarity index 100%
rename from tests/expectations/tag/std_lib.c
rename to tests/expectations/std_lib.tag.c
diff --git a/tests/expectations/tag/std_lib.compat.c b/tests/expectations/std_lib.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/std_lib.compat.c
rename to tests/expectations/std_lib.tag.compat.c
diff --git a/tests/expectations/both/struct.c b/tests/expectations/struct.both.c
similarity index 100%
rename from tests/expectations/both/struct.c
rename to tests/expectations/struct.both.c
diff --git a/tests/expectations/both/struct.compat.c b/tests/expectations/struct.both.compat.c
similarity index 100%
rename from tests/expectations/both/struct.compat.c
rename to tests/expectations/struct.both.compat.c
diff --git a/tests/expectations/tag/struct.c b/tests/expectations/struct.tag.c
similarity index 100%
rename from tests/expectations/tag/struct.c
rename to tests/expectations/struct.tag.c
diff --git a/tests/expectations/tag/struct.compat.c b/tests/expectations/struct.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/struct.compat.c
rename to tests/expectations/struct.tag.compat.c
diff --git a/tests/expectations/both/struct_literal.c b/tests/expectations/struct_literal.both.c
similarity index 100%
rename from tests/expectations/both/struct_literal.c
rename to tests/expectations/struct_literal.both.c
diff --git a/tests/expectations/both/struct_literal.compat.c b/tests/expectations/struct_literal.both.compat.c
similarity index 100%
rename from tests/expectations/both/struct_literal.compat.c
rename to tests/expectations/struct_literal.both.compat.c
diff --git a/tests/expectations/tag/struct_literal.c b/tests/expectations/struct_literal.tag.c
similarity index 100%
rename from tests/expectations/tag/struct_literal.c
rename to tests/expectations/struct_literal.tag.c
diff --git a/tests/expectations/tag/struct_literal.compat.c b/tests/expectations/struct_literal.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/struct_literal.compat.c
rename to tests/expectations/struct_literal.tag.compat.c
diff --git a/tests/expectations/both/struct_literal_order.c b/tests/expectations/struct_literal_order.both.c
similarity index 100%
rename from tests/expectations/both/struct_literal_order.c
rename to tests/expectations/struct_literal_order.both.c
diff --git a/tests/expectations/both/struct_literal_order.compat.c b/tests/expectations/struct_literal_order.both.compat.c
similarity index 100%
rename from tests/expectations/both/struct_literal_order.compat.c
rename to tests/expectations/struct_literal_order.both.compat.c
diff --git a/tests/expectations/tag/struct_literal_order.c b/tests/expectations/struct_literal_order.tag.c
similarity index 100%
rename from tests/expectations/tag/struct_literal_order.c
rename to tests/expectations/struct_literal_order.tag.c
diff --git a/tests/expectations/tag/struct_literal_order.compat.c b/tests/expectations/struct_literal_order.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/struct_literal_order.compat.c
rename to tests/expectations/struct_literal_order.tag.compat.c
diff --git a/tests/expectations/both/struct_self.c b/tests/expectations/struct_self.both.c
similarity index 100%
rename from tests/expectations/both/struct_self.c
rename to tests/expectations/struct_self.both.c
diff --git a/tests/expectations/both/struct_self.compat.c b/tests/expectations/struct_self.both.compat.c
similarity index 100%
rename from tests/expectations/both/struct_self.compat.c
rename to tests/expectations/struct_self.both.compat.c
diff --git a/tests/expectations/tag/struct_self.c b/tests/expectations/struct_self.tag.c
similarity index 100%
rename from tests/expectations/tag/struct_self.c
rename to tests/expectations/struct_self.tag.c
diff --git a/tests/expectations/tag/struct_self.compat.c b/tests/expectations/struct_self.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/struct_self.compat.c
rename to tests/expectations/struct_self.tag.compat.c
diff --git a/tests/expectations/tag/nested_import.c b/tests/expectations/style-crash.both.c
similarity index 100%
rename from tests/expectations/tag/nested_import.c
rename to tests/expectations/style-crash.both.c
diff --git a/tests/expectations/tag/nested_import.compat.c b/tests/expectations/style-crash.both.compat.c
similarity index 100%
rename from tests/expectations/tag/nested_import.compat.c
rename to tests/expectations/style-crash.both.compat.c
diff --git a/tests/expectations/tag/style-crash.c b/tests/expectations/style-crash.tag.c
similarity index 100%
rename from tests/expectations/tag/style-crash.c
rename to tests/expectations/style-crash.tag.c
diff --git a/tests/expectations/tag/style-crash.compat.c b/tests/expectations/style-crash.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/style-crash.compat.c
rename to tests/expectations/style-crash.tag.compat.c
diff --git a/tests/expectations/both/swift_name.c b/tests/expectations/swift_name.both.c
similarity index 100%
rename from tests/expectations/both/swift_name.c
rename to tests/expectations/swift_name.both.c
diff --git a/tests/expectations/both/swift_name.compat.c b/tests/expectations/swift_name.both.compat.c
similarity index 100%
rename from tests/expectations/both/swift_name.compat.c
rename to tests/expectations/swift_name.both.compat.c
diff --git a/tests/expectations/tag/swift_name.c b/tests/expectations/swift_name.tag.c
similarity index 100%
rename from tests/expectations/tag/swift_name.c
rename to tests/expectations/swift_name.tag.c
diff --git a/tests/expectations/tag/swift_name.compat.c b/tests/expectations/swift_name.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/swift_name.compat.c
rename to tests/expectations/swift_name.tag.compat.c
diff --git a/tests/expectations/both/transform-op.c b/tests/expectations/transform-op.both.c
similarity index 100%
rename from tests/expectations/both/transform-op.c
rename to tests/expectations/transform-op.both.c
diff --git a/tests/expectations/both/transform-op.compat.c b/tests/expectations/transform-op.both.compat.c
similarity index 100%
rename from tests/expectations/both/transform-op.compat.c
rename to tests/expectations/transform-op.both.compat.c
diff --git a/tests/expectations/tag/transform-op.c b/tests/expectations/transform-op.tag.c
similarity index 100%
rename from tests/expectations/tag/transform-op.c
rename to tests/expectations/transform-op.tag.c
diff --git a/tests/expectations/tag/transform-op.compat.c b/tests/expectations/transform-op.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/transform-op.compat.c
rename to tests/expectations/transform-op.tag.compat.c
diff --git a/tests/expectations/both/transparent.c b/tests/expectations/transparent.both.c
similarity index 100%
rename from tests/expectations/both/transparent.c
rename to tests/expectations/transparent.both.c
diff --git a/tests/expectations/both/transparent.compat.c b/tests/expectations/transparent.both.compat.c
similarity index 100%
rename from tests/expectations/both/transparent.compat.c
rename to tests/expectations/transparent.both.compat.c
diff --git a/tests/expectations/tag/transparent.c b/tests/expectations/transparent.tag.c
similarity index 100%
rename from tests/expectations/tag/transparent.c
rename to tests/expectations/transparent.tag.c
diff --git a/tests/expectations/tag/transparent.compat.c b/tests/expectations/transparent.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/transparent.compat.c
rename to tests/expectations/transparent.tag.compat.c
diff --git a/tests/expectations/both/typedef.c b/tests/expectations/typedef.both.c
similarity index 100%
rename from tests/expectations/both/typedef.c
rename to tests/expectations/typedef.both.c
diff --git a/tests/expectations/both/typedef.compat.c b/tests/expectations/typedef.both.compat.c
similarity index 100%
rename from tests/expectations/both/typedef.compat.c
rename to tests/expectations/typedef.both.compat.c
diff --git a/tests/expectations/tag/typedef.c b/tests/expectations/typedef.tag.c
similarity index 100%
rename from tests/expectations/tag/typedef.c
rename to tests/expectations/typedef.tag.c
diff --git a/tests/expectations/tag/typedef.compat.c b/tests/expectations/typedef.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/typedef.compat.c
rename to tests/expectations/typedef.tag.compat.c
diff --git a/tests/expectations/both/union.c b/tests/expectations/union.both.c
similarity index 100%
rename from tests/expectations/both/union.c
rename to tests/expectations/union.both.c
diff --git a/tests/expectations/both/union.compat.c b/tests/expectations/union.both.compat.c
similarity index 100%
rename from tests/expectations/both/union.compat.c
rename to tests/expectations/union.both.compat.c
diff --git a/tests/expectations/tag/union.c b/tests/expectations/union.tag.c
similarity index 100%
rename from tests/expectations/tag/union.c
rename to tests/expectations/union.tag.c
diff --git a/tests/expectations/tag/union.compat.c b/tests/expectations/union.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/union.compat.c
rename to tests/expectations/union.tag.compat.c
diff --git a/tests/expectations/both/union_self.c b/tests/expectations/union_self.both.c
similarity index 100%
rename from tests/expectations/both/union_self.c
rename to tests/expectations/union_self.both.c
diff --git a/tests/expectations/both/union_self.compat.c b/tests/expectations/union_self.both.compat.c
similarity index 100%
rename from tests/expectations/both/union_self.compat.c
rename to tests/expectations/union_self.both.compat.c
diff --git a/tests/expectations/tag/union_self.c b/tests/expectations/union_self.tag.c
similarity index 100%
rename from tests/expectations/tag/union_self.c
rename to tests/expectations/union_self.tag.c
diff --git a/tests/expectations/tag/union_self.compat.c b/tests/expectations/union_self.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/union_self.compat.c
rename to tests/expectations/union_self.tag.compat.c
diff --git a/tests/expectations/both/using_namespaces.c b/tests/expectations/using_namespaces.both.c
similarity index 100%
rename from tests/expectations/both/using_namespaces.c
rename to tests/expectations/using_namespaces.both.c
diff --git a/tests/expectations/both/using_namespaces.compat.c b/tests/expectations/using_namespaces.both.compat.c
similarity index 100%
rename from tests/expectations/both/using_namespaces.compat.c
rename to tests/expectations/using_namespaces.both.compat.c
diff --git a/tests/expectations/tag/using_namespaces.c b/tests/expectations/using_namespaces.tag.c
similarity index 100%
rename from tests/expectations/tag/using_namespaces.c
rename to tests/expectations/using_namespaces.tag.c
diff --git a/tests/expectations/tag/using_namespaces.compat.c b/tests/expectations/using_namespaces.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/using_namespaces.compat.c
rename to tests/expectations/using_namespaces.tag.compat.c
diff --git a/tests/expectations/both/va_list.c b/tests/expectations/va_list.both.c
similarity index 100%
rename from tests/expectations/both/va_list.c
rename to tests/expectations/va_list.both.c
diff --git a/tests/expectations/both/va_list.compat.c b/tests/expectations/va_list.both.compat.c
similarity index 100%
rename from tests/expectations/both/va_list.compat.c
rename to tests/expectations/va_list.both.compat.c
diff --git a/tests/expectations/tag/va_list.c b/tests/expectations/va_list.tag.c
similarity index 100%
rename from tests/expectations/tag/va_list.c
rename to tests/expectations/va_list.tag.c
diff --git a/tests/expectations/tag/va_list.compat.c b/tests/expectations/va_list.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/va_list.compat.c
rename to tests/expectations/va_list.tag.compat.c
diff --git a/tests/expectations/both/workspace.c b/tests/expectations/workspace.both.c
similarity index 100%
rename from tests/expectations/both/workspace.c
rename to tests/expectations/workspace.both.c
diff --git a/tests/expectations/both/workspace.compat.c b/tests/expectations/workspace.both.compat.c
similarity index 100%
rename from tests/expectations/both/workspace.compat.c
rename to tests/expectations/workspace.both.compat.c
diff --git a/tests/expectations/tag/workspace.c b/tests/expectations/workspace.tag.c
similarity index 100%
rename from tests/expectations/tag/workspace.c
rename to tests/expectations/workspace.tag.c
diff --git a/tests/expectations/tag/workspace.compat.c b/tests/expectations/workspace.tag.compat.c
similarity index 100%
rename from tests/expectations/tag/workspace.compat.c
rename to tests/expectations/workspace.tag.compat.c
diff --git a/tests/tests.rs b/tests/tests.rs
index b622468..42635df 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -144,32 +144,24 @@ fn run_compile_test(
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let tests_path = Path::new(&crate_dir).join("tests");
     let mut generated_file = tests_path.join("expectations");
-    if let Some(style) = style {
-        match style {
-            Style::Both => {
-                generated_file.push("both");
-            }
-            Style::Tag => {
-                generated_file.push("tag");
-            }
-            Style::Type => {}
-        }
-    }
 
-    let ext = match language {
-        Language::Cxx => "cpp",
-        Language::C => {
-            if cpp_compat {
-                "compat.c"
-            } else {
-                "c"
-            }
-        }
+    let style_ext = style
+        .map(|style| match style {
+            Style::Both => ".both",
+            Style::Tag => ".tag",
+            Style::Type => "",
+        })
+        .unwrap_or_default();
+    let lang_ext = match language {
+        Language::Cxx => ".cpp",
+        Language::C if cpp_compat => ".compat.c",
+        Language::C => ".c",
     };
 
     let skip_warning_as_error = name.rfind(SKIP_WARNING_AS_ERROR_SUFFIX).is_some();
 
-    let source_file = format!("{}.{}", &name, &ext).replace(SKIP_WARNING_AS_ERROR_SUFFIX, "");
+    let source_file =
+        format!("{}{}{}", name, style_ext, lang_ext).replace(SKIP_WARNING_AS_ERROR_SUFFIX, "");
 
     generated_file.push(source_file);