diff --git a/tests/regressions/precentage-margin/.gitignore b/tests/core/top-margin/.gitignore
similarity index 100%
rename from tests/regressions/precentage-margin/.gitignore
rename to tests/core/top-margin/.gitignore
diff --git a/tests/core/get-rules/top-margin/test.typ b/tests/core/top-margin/test.typ
similarity index 100%
rename from tests/core/get-rules/top-margin/test.typ
rename to tests/core/top-margin/test.typ
diff --git a/tests/regressions/scoped-search/.gitignore b/tests/regressions/issue-15-zero-margin/.gitignore
similarity index 100%
rename from tests/regressions/scoped-search/.gitignore
rename to tests/regressions/issue-15-zero-margin/.gitignore
diff --git a/tests/regressions/zero-margin/document.typ b/tests/regressions/issue-15-zero-margin/document.typ
similarity index 100%
rename from tests/regressions/zero-margin/document.typ
rename to tests/regressions/issue-15-zero-margin/document.typ
diff --git a/tests/regressions/zero-margin/ref.typ b/tests/regressions/issue-15-zero-margin/ref.typ
similarity index 100%
rename from tests/regressions/zero-margin/ref.typ
rename to tests/regressions/issue-15-zero-margin/ref.typ
diff --git a/tests/regressions/zero-margin/test.typ b/tests/regressions/issue-15-zero-margin/test.typ
similarity index 89%
rename from tests/regressions/zero-margin/test.typ
rename to tests/regressions/issue-15-zero-margin/test.typ
index 014bafb..6da7643 100644
--- a/tests/regressions/zero-margin/test.typ
+++ b/tests/regressions/issue-15-zero-margin/test.typ
@@ -1,5 +1,4 @@
 /// Synopsis:
-/// - Tracked in #15.
 /// - Hydra can properly handle a zero-length margin and does not panic.
 
 #import "/src/lib.typ": hydra
diff --git a/tests/regressions/zero-margin/.gitignore b/tests/regressions/issue-31-precentage-margin/.gitignore
similarity index 100%
rename from tests/regressions/zero-margin/.gitignore
rename to tests/regressions/issue-31-precentage-margin/.gitignore
diff --git a/tests/regressions/precentage-margin/document.typ b/tests/regressions/issue-31-precentage-margin/document.typ
similarity index 100%
rename from tests/regressions/precentage-margin/document.typ
rename to tests/regressions/issue-31-precentage-margin/document.typ
diff --git a/tests/regressions/precentage-margin/ref.typ b/tests/regressions/issue-31-precentage-margin/ref.typ
similarity index 100%
rename from tests/regressions/precentage-margin/ref.typ
rename to tests/regressions/issue-31-precentage-margin/ref.typ
diff --git a/tests/regressions/precentage-margin/test.typ b/tests/regressions/issue-31-precentage-margin/test.typ
similarity index 90%
rename from tests/regressions/precentage-margin/test.typ
rename to tests/regressions/issue-31-precentage-margin/test.typ
index 2e85e67..820c036 100644
--- a/tests/regressions/precentage-margin/test.typ
+++ b/tests/regressions/issue-31-precentage-margin/test.typ
@@ -1,5 +1,4 @@
 /// Synopsis:
-/// - Tracked in #31.
 /// - The smallest page should only be used for the `2.5 / 21` fallback.
 
 #import "/src/lib.typ": hydra
diff --git a/tests/core/get-rules/top-margin/.gitignore b/tests/regressions/issue-5-scoped-search/.gitignore
similarity index 62%
rename from tests/core/get-rules/top-margin/.gitignore
rename to tests/regressions/issue-5-scoped-search/.gitignore
index 03681f9..2e4c5d8 100644
--- a/tests/core/get-rules/top-margin/.gitignore
+++ b/tests/regressions/issue-5-scoped-search/.gitignore
@@ -1,5 +1,5 @@
 # generated by tytanic, do not edit
 
-diff/**
-out/**
-ref/**
+/diff/
+/out/
+/ref/
diff --git a/tests/regressions/scoped-search/document.typ b/tests/regressions/issue-5-scoped-search/document.typ
similarity index 100%
rename from tests/regressions/scoped-search/document.typ
rename to tests/regressions/issue-5-scoped-search/document.typ
diff --git a/tests/regressions/scoped-search/ref.typ b/tests/regressions/issue-5-scoped-search/ref.typ
similarity index 100%
rename from tests/regressions/scoped-search/ref.typ
rename to tests/regressions/issue-5-scoped-search/ref.typ
diff --git a/tests/regressions/scoped-search/test.typ b/tests/regressions/issue-5-scoped-search/test.typ
similarity index 94%
rename from tests/regressions/scoped-search/test.typ
rename to tests/regressions/issue-5-scoped-search/test.typ
index f6592d2..a07033e 100644
--- a/tests/regressions/scoped-search/test.typ
+++ b/tests/regressions/issue-5-scoped-search/test.typ
@@ -1,5 +1,4 @@
 /// Synopsis:
-/// - Tracked in #5.
 /// - If a level 2 heading cannot be found, then hydra will not go further than
 ///   a level 1 heading back, i.e. it respects ancestor boundaries.