diff --git a/test/shaping/texts/in-tree/MANIFEST b/test/shaping/texts/in-tree/MANIFEST
index 134f6c1761f7b871a2173178686684025f938303..5fd8eb9b91969d842d916b88a26d232987f9e732 100644
--- a/test/shaping/texts/in-tree/MANIFEST
+++ b/test/shaping/texts/in-tree/MANIFEST
@@ -1,7 +1,5 @@
-script-default
 shaper-arabic
 shaper-default
-shaper-hangul
 shaper-indic
 shaper-myanmar
 shaper-sea
diff --git a/test/shaping/texts/in-tree/shaper-default/MANIFEST b/test/shaping/texts/in-tree/shaper-default/MANIFEST
index f2a6e7d071eba3dfa132831c15c2d00a476cba81..7682db487452a5ae64d6c9696973b8316405dd6e 100644
--- a/test/shaping/texts/in-tree/shaper-default/MANIFEST
+++ b/test/shaping/texts/in-tree/shaper-default/MANIFEST
@@ -1,6 +1,8 @@
 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/script-default/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/script-default/MANIFEST
rename to test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST
diff --git a/test/shaping/texts/in-tree/script-default/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/script-default/misc/MANIFEST
rename to test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt b/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt
rename to test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST
rename to test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST
rename to test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST
diff --git a/test/shaping/texts/in-tree/script-default/misc/misc.txt b/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-tree/script-default/misc/misc.txt
rename to test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-hangul/MANIFEST b/test/shaping/texts/in-tree/shaper-hangul/MANIFEST
deleted file mode 100644
index ea817167831a8a0902e9aa6f923552ce345f4a11..0000000000000000000000000000000000000000
--- a/test/shaping/texts/in-tree/shaper-hangul/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-script-hangul