diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/bar.c b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/bar.c
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/bar.c
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/bar.c
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/dune b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/dune
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/dune
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/dune-project b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/dune-project
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/include/bar.h b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/include/bar.h
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/include/bar.h
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/include/bar.h
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/lexers/dune b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/lexers/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/lexers/dune
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/lexers/dune
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/lexers/lexer1.mll b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/lexers/lexer1.mll
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/lexers/lexer1.mll
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/lexers/lexer1.mll
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/run.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/run.t
diff --git a/test/blackbox-tests/test-cases/copy_files/test1.t/test.ml b/test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test1.t/test.ml
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test1.t/test.ml
diff --git a/test/blackbox-tests/test-cases/copy_files/test2.t/dune b/test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test2.t/dune
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/dune
diff --git a/test/blackbox-tests/test-cases/copy_files/test2.t/dune-project b/test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test2.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/dune-project
diff --git a/test/blackbox-tests/test-cases/copy_files/test2.t/foo/dune b/test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/foo/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test2.t/foo/dune
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/foo/dune
diff --git a/test/blackbox-tests/test-cases/copy_files/test2.t/run.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test2.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test2.t/run.t
diff --git a/test/blackbox-tests/test-cases/copy_files/test3.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test3.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test3.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test3.t
diff --git a/test/blackbox-tests/test-cases/copy_files/test4.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test4.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test4.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test4.t
diff --git a/test/blackbox-tests/test-cases/copy_files/test5.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test5.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test5.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test5.t
diff --git a/test/blackbox-tests/test-cases/copy_files/test6.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test6.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test6.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test6.t
diff --git a/test/blackbox-tests/test-cases/copy_files/test7.t b/test/blackbox-tests/test-cases/stanzas/copy_files/test7.t
similarity index 100%
rename from test/blackbox-tests/test-cases/copy_files/test7.t
rename to test/blackbox-tests/test-cases/stanzas/copy_files/test7.t
diff --git a/test/blackbox-tests/test-cases/dynamic-include-stanza/cycle.t b/test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/cycle.t
similarity index 100%
rename from test/blackbox-tests/test-cases/dynamic-include-stanza/cycle.t
rename to test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/cycle.t
diff --git a/test/blackbox-tests/test-cases/dynamic-include-stanza/dynamic-include-stanza.t b/test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/dynamic-include-stanza.t
similarity index 100%
rename from test/blackbox-tests/test-cases/dynamic-include-stanza/dynamic-include-stanza.t
rename to test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/dynamic-include-stanza.t
diff --git a/test/blackbox-tests/test-cases/dynamic-include-stanza/forbidden-stanzas.t b/test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/forbidden-stanzas.t
similarity index 100%
rename from test/blackbox-tests/test-cases/dynamic-include-stanza/forbidden-stanzas.t
rename to test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/forbidden-stanzas.t
diff --git a/test/blackbox-tests/test-cases/dynamic-include-stanza/nested.t b/test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/nested.t
similarity index 100%
rename from test/blackbox-tests/test-cases/dynamic-include-stanza/nested.t
rename to test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/nested.t
diff --git a/test/blackbox-tests/test-cases/dynamic-include-stanza/static-inside-dynamic.t b/test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/static-inside-dynamic.t
similarity index 100%
rename from test/blackbox-tests/test-cases/dynamic-include-stanza/static-inside-dynamic.t
rename to test/blackbox-tests/test-cases/stanzas/dynamic-include-stanza/static-inside-dynamic.t
diff --git a/test/blackbox-tests/test-cases/include-stanza/github2711.t b/test/blackbox-tests/test-cases/stanzas/include-stanza/github2711.t
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/github2711.t
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/github2711.t
diff --git a/test/blackbox-tests/test-cases/include-stanza/in-subdir.t b/test/blackbox-tests/test-cases/stanzas/include-stanza/in-subdir.t
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/in-subdir.t
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/in-subdir.t
diff --git a/test/blackbox-tests/test-cases/include-stanza/include-loop.t/a.inc b/test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/a.inc
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/include-loop.t/a.inc
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/a.inc
diff --git a/test/blackbox-tests/test-cases/include-stanza/include-loop.t/b.inc b/test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/b.inc
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/include-loop.t/b.inc
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/b.inc
diff --git a/test/blackbox-tests/test-cases/include-stanza/include-loop.t/c.inc b/test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/c.inc
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/include-loop.t/c.inc
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/c.inc
diff --git a/test/blackbox-tests/test-cases/include-stanza/include-loop.t/dune b/test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/include-loop.t/dune
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/dune
diff --git a/test/blackbox-tests/test-cases/include-stanza/include-loop.t/dune-project b/test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/include-loop.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/dune-project
diff --git a/test/blackbox-tests/test-cases/include-stanza/include-loop.t/run.t b/test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/include-loop.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/include-loop.t/run.t
diff --git a/test/blackbox-tests/test-cases/include-stanza/parent-dir.t b/test/blackbox-tests/test-cases/stanzas/include-stanza/parent-dir.t
similarity index 100%
rename from test/blackbox-tests/test-cases/include-stanza/parent-dir.t
rename to test/blackbox-tests/test-cases/stanzas/include-stanza/parent-dir.t
diff --git a/test/blackbox-tests/test-cases/subdir-stanza/basic.t b/test/blackbox-tests/test-cases/stanzas/subdir-stanza/basic.t
similarity index 100%
rename from test/blackbox-tests/test-cases/subdir-stanza/basic.t
rename to test/blackbox-tests/test-cases/stanzas/subdir-stanza/basic.t
diff --git a/test/blackbox-tests/test-cases/subdir-stanza/gh4907.t b/test/blackbox-tests/test-cases/stanzas/subdir-stanza/gh4907.t
similarity index 100%
rename from test/blackbox-tests/test-cases/subdir-stanza/gh4907.t
rename to test/blackbox-tests/test-cases/stanzas/subdir-stanza/gh4907.t
diff --git a/test/blackbox-tests/test-cases/subdir-stanza/recursive-alias.t b/test/blackbox-tests/test-cases/stanzas/subdir-stanza/recursive-alias.t
similarity index 100%
rename from test/blackbox-tests/test-cases/subdir-stanza/recursive-alias.t
rename to test/blackbox-tests/test-cases/stanzas/subdir-stanza/recursive-alias.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza/generated.t/dune b/test/blackbox-tests/test-cases/stanzas/tests/generated.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/generated.t/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/generated.t/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza/generated.t/dune-project b/test/blackbox-tests/test-cases/stanzas/tests/generated.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/generated.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/tests/generated.t/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza/generated.t/generated.ml b/test/blackbox-tests/test-cases/stanzas/tests/generated.t/generated.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/generated.t/generated.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/generated.t/generated.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza/generated.t/run.t b/test/blackbox-tests/test-cases/stanzas/tests/generated.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/generated.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/tests/generated.t/run.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza/modes.t/dune b/test/blackbox-tests/test-cases/stanzas/tests/modes.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/modes.t/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/modes.t/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza/modes.t/dune-project b/test/blackbox-tests/test-cases/stanzas/tests/modes.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/modes.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/tests/modes.t/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza/modes.t/modes.expected b/test/blackbox-tests/test-cases/stanzas/tests/modes.t/modes.expected
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/modes.t/modes.expected
rename to test/blackbox-tests/test-cases/stanzas/tests/modes.t/modes.expected
diff --git a/test/blackbox-tests/test-cases/tests-stanza/modes.t/modes.ml b/test/blackbox-tests/test-cases/stanzas/tests/modes.t/modes.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/modes.t/modes.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/modes.t/modes.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza/modes.t/run.t b/test/blackbox-tests/test-cases/stanzas/tests/modes.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/modes.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/tests/modes.t/run.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/dune b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/dune-project b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/expect_test.expected b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/expect_test.expected
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/expect_test.expected
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/expect_test.expected
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/expect_test.ml b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/expect_test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/expect_test.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/expect_test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/regular_test.ml b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/regular_test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/regular_test.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/regular_test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/regular_test2.ml b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/regular_test2.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/regular_test2.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/regular_test2.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural.t/run.t b/test/blackbox-tests/test-cases/stanzas/tests/plural.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/plural.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/tests/plural.t/run.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza/singular.t/dune b/test/blackbox-tests/test-cases/stanzas/tests/singular.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/singular.t/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/singular.t/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza/singular.t/dune-project b/test/blackbox-tests/test-cases/stanzas/tests/singular.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/singular.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/tests/singular.t/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza/singular.t/run.t b/test/blackbox-tests/test-cases/stanzas/tests/singular.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/singular.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/tests/singular.t/run.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza/singular.t/singular.ml b/test/blackbox-tests/test-cases/stanzas/tests/singular.t/singular.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza/singular.t/singular.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/singular.t/singular.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/dune b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/dune-project b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/run.t b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/run.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/test.ml b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action-syntax-version.t/test.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action-syntax-version.t/test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/default/dune b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/default/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/default/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/default/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/default/my_test.ml b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/default/my_test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/default/my_test.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/default/my_test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/dune-project b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-expect/dune b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-expect/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-expect/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-expect/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-expect/my_test.expected b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-expect/my_test.expected
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-expect/my_test.expected
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-expect/my_test.expected
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-expect/my_test.ml b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-expect/my_test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-expect/my_test.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-expect/my_test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-regular/dune b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-regular/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-regular/dune
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-regular/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-regular/my_test.ml b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-regular/my_test.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/explicit-regular/my_test.ml
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/explicit-regular/my_test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza-action.t/run.t b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-action.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-action.t/run.t
diff --git a/test/blackbox-tests/test-cases/tests-stanza-expected-deps.t b/test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-expected-deps.t
similarity index 100%
rename from test/blackbox-tests/test-cases/tests-stanza-expected-deps.t
rename to test/blackbox-tests/test-cases/stanzas/tests/tests-stanza-expected-deps.t
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/dune b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/dune
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/dune
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/dune-project b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/dune-project
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/fooppx.ml b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/fooppx.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/fooppx.ml
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/fooppx.ml
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/init.ml b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/init.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/init.ml
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/init.ml
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/run.t b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/preprocessors.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/preprocessors.t/run.t
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/simple.t/dune b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/dune
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/simple.t/dune
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/dune
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/simple.t/dune-project b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/simple.t/dune-project
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/dune-project
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/simple.t/foo.ml b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/foo.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/simple.t/foo.ml
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/foo.ml
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/simple.t/init.ml b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/init.ml
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/simple.t/init.ml
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/init.ml
diff --git a/test/blackbox-tests/test-cases/toplevel-stanza/simple.t/run.t b/test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/toplevel-stanza/simple.t/run.t
rename to test/blackbox-tests/test-cases/stanzas/toplevel-stanza/simple.t/run.t
diff --git a/test/blackbox-tests/test-cases/subst.t b/test/blackbox-tests/test-cases/subst/subst.t
similarity index 100%
rename from test/blackbox-tests/test-cases/subst.t
rename to test/blackbox-tests/test-cases/subst/subst.t