diff --git a/test/shaping/texts/in-tree/MANIFEST b/test/shaping/texts/in-tree/MANIFEST
index 5fd8eb9b9..f7a7a969a 100644
--- a/test/shaping/texts/in-tree/MANIFEST
+++ b/test/shaping/texts/in-tree/MANIFEST
@@ -1,6 +1,9 @@
 shaper-arabic
 shaper-default
+shaper-hangul
+shaper-hebrew
 shaper-indic
 shaper-myanmar
 shaper-sea
 shaper-thai
+shaper-tibetan
diff --git a/test/shaping/texts/in-tree/shaper-default/MANIFEST b/test/shaping/texts/in-tree/shaper-default/MANIFEST
index 7682db487..d08deb7e3 100644
--- a/test/shaping/texts/in-tree/shaper-default/MANIFEST
+++ b/test/shaping/texts/in-tree/shaper-default/MANIFEST
@@ -1,8 +1,5 @@
 script-ethiopic
 script-han
-script-hangul
-script-hebrew
 script-hiragana
 script-linear-b
-script-tibetan
 script-tifinagh
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST
rename to test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST
rename to test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt
rename to test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hebrew/MANIFEST b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-hebrew/MANIFEST
rename to test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/MANIFEST
rename to test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt
rename to test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST
rename to test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST
rename to test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt
rename to test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt