diff --git a/test/shaping/texts/in-tree/shaper-default/MANIFEST b/test/shaping/texts/in-tree/shaper-default/MANIFEST
index 0e08c0b90..f14322c1a 100644
--- a/test/shaping/texts/in-tree/shaper-default/MANIFEST
+++ b/test/shaping/texts/in-tree/shaper-default/MANIFEST
@@ -1,3 +1,4 @@
+script-han
 script-hebrew
-script-japanese
+script-hiragana
 script-linear-b
diff --git a/test/shaping/texts/in-tree/shaper-default/script-japanese/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-han/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-japanese/MANIFEST
rename to test/shaping/texts/in-tree/shaper-default/script-han/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-han/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-han/misc/MANIFEST
new file mode 100644
index 000000000..003c956cd
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-default/script-han/misc/MANIFEST
@@ -0,0 +1 @@
+cjk-compat.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-han/misc/cjk-compat.txt b/test/shaping/texts/in-tree/shaper-default/script-han/misc/cjk-compat.txt
new file mode 100644
index 000000000..b3ab64570
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-default/script-han/misc/cjk-compat.txt
@@ -0,0 +1,3 @@
+艹
+艹
+艹
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hiragana/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hiragana/MANIFEST
new file mode 100644
index 000000000..b8752e7b9
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-default/script-hiragana/MANIFEST
@@ -0,0 +1 @@
+misc
diff --git a/test/shaping/texts/in-tree/shaper-default/script-japanese/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/MANIFEST
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-japanese/misc/MANIFEST
rename to test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/MANIFEST
diff --git a/test/shaping/texts/in-tree/shaper-default/script-japanese/misc/kazuraki-liga-lines.txt b/test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-japanese/misc/kazuraki-liga-lines.txt
rename to test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-japanese/misc/kazuraki-liga.txt b/test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/kazuraki-liga.txt
similarity index 100%
rename from test/shaping/texts/in-tree/shaper-default/script-japanese/misc/kazuraki-liga.txt
rename to test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/kazuraki-liga.txt