diff --git a/editions/test/tiddlers/tests/data/macros/NestedMacros-indented.tid b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid
similarity index 100%
rename from editions/test/tiddlers/tests/data/macros/NestedMacros-indented.tid
rename to editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid
diff --git a/editions/test/tiddlers/tests/data/macros/NestedMacros-indented2.tid b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid
similarity index 100%
rename from editions/test/tiddlers/tests/data/macros/NestedMacros-indented2.tid
rename to editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid
diff --git a/editions/test/tiddlers/tests/data/macros/NestedMacros.tid b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros.tid
similarity index 100%
rename from editions/test/tiddlers/tests/data/macros/NestedMacros.tid
rename to editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros.tid
diff --git a/editions/test/tiddlers/tests/data/macros/TrailingNewlines.tid b/editions/test/tiddlers/tests/data/macros/trailing-newlines/TrailingNewlines.tid
similarity index 100%
rename from editions/test/tiddlers/tests/data/macros/TrailingNewlines.tid
rename to editions/test/tiddlers/tests/data/macros/trailing-newlines/TrailingNewlines.tid