diff --git a/test/fuzzing/run-fuzzer-tests.py b/test/fuzzing/run-fuzzer-tests.py
index 673ee9a96..23922ccd4 100755
--- a/test/fuzzing/run-fuzzer-tests.py
+++ b/test/fuzzing/run-fuzzer-tests.py
@@ -19,7 +19,7 @@ please provide it as the first argument to the tool""")
 print ('hb_fuzzer:', hb_fuzzer)
 fails = 0
 
-for line in open (os.path.join (srcdir, "..", "shaping", "tests", "fuzzed.tests")):
+for line in open (os.path.join (srcdir, "..", "shaping", "tests", "misc", "fuzzed.tests")):
 	font = line.split (":")[0]
 
 	p = subprocess.Popen (
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 4379363fb..e2944f607 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -42,47 +42,47 @@ CLEANFILES += \
 	$(NULL)
 
 TESTS = \
-	tests/arabic-fallback-shaping.tests \
-	tests/arabic-feature-order.tests \
-	tests/arabic-like-joining.tests \
-	tests/arabic-mark-order.tests \
-	tests/arabic-stch.tests \
-	tests/automatic-fractions.tests \
-	tests/cluster.tests \
-	tests/color-fonts.tests \
-	tests/context-matching.tests \
-	tests/cursive-positioning.tests \
-	tests/default-ignorables.tests \
-	tests/emoji-flag-tags.tests \
-	tests/fallback-positioning.tests \
-	tests/fuzzed.tests \
-	tests/hangul-jamo.tests \
-	tests/hyphens.tests \
-	tests/indic-consonant-with-stacker.tests \
-	tests/indic-init.tests \
-	tests/indic-joiner-candrabindu.tests \
-	tests/indic-joiners.tests \
-	tests/indic-old-spec.tests \
-	tests/indic-pref-blocking.tests \
-	tests/indic-script-extensions.tests \
-	tests/indic-special-cases.tests \
-	tests/indic-syllable.tests \
-	tests/language-tags.tests \
-	tests/ligature-id.tests \
-	tests/mark-attachment.tests \
-	tests/mark-filtering-sets.tests \
-	tests/mongolian-variation-selector.tests \
-	tests/spaces.tests \
-	tests/simple.tests \
-	tests/tibetan-contractions-1.tests \
-	tests/tibetan-contractions-2.tests \
-	tests/tibetan-vowels.tests \
-	tests/use.tests \
-	tests/use-marchen.tests \
-	tests/use-syllable.tests \
-	tests/variations-rvrn.tests \
-	tests/vertical.tests \
-	tests/zero-width-marks.tests \
+	tests/misc/arabic-fallback-shaping.tests \
+	tests/misc/arabic-feature-order.tests \
+	tests/misc/arabic-like-joining.tests \
+	tests/misc/arabic-mark-order.tests \
+	tests/misc/arabic-stch.tests \
+	tests/misc/automatic-fractions.tests \
+	tests/misc/cluster.tests \
+	tests/misc/color-fonts.tests \
+	tests/misc/context-matching.tests \
+	tests/misc/cursive-positioning.tests \
+	tests/misc/default-ignorables.tests \
+	tests/misc/emoji-flag-tags.tests \
+	tests/misc/fallback-positioning.tests \
+	tests/misc/fuzzed.tests \
+	tests/misc/hangul-jamo.tests \
+	tests/misc/hyphens.tests \
+	tests/misc/indic-consonant-with-stacker.tests \
+	tests/misc/indic-init.tests \
+	tests/misc/indic-joiner-candrabindu.tests \
+	tests/misc/indic-joiners.tests \
+	tests/misc/indic-old-spec.tests \
+	tests/misc/indic-pref-blocking.tests \
+	tests/misc/indic-script-extensions.tests \
+	tests/misc/indic-special-cases.tests \
+	tests/misc/indic-syllable.tests \
+	tests/misc/language-tags.tests \
+	tests/misc/ligature-id.tests \
+	tests/misc/mark-attachment.tests \
+	tests/misc/mark-filtering-sets.tests \
+	tests/misc/mongolian-variation-selector.tests \
+	tests/misc/spaces.tests \
+	tests/misc/simple.tests \
+	tests/misc/tibetan-contractions-1.tests \
+	tests/misc/tibetan-contractions-2.tests \
+	tests/misc/tibetan-vowels.tests \
+	tests/misc/use.tests \
+	tests/misc/use-marchen.tests \
+	tests/misc/use-syllable.tests \
+	tests/misc/variations-rvrn.tests \
+	tests/misc/vertical.tests \
+	tests/misc/zero-width-marks.tests \
 	$(NULL)
 
 TEST_EXTENSIONS = \
diff --git a/test/shaping/tests/arabic-fallback-shaping.tests b/test/shaping/tests/misc/arabic-fallback-shaping.tests
similarity index 100%
rename from test/shaping/tests/arabic-fallback-shaping.tests
rename to test/shaping/tests/misc/arabic-fallback-shaping.tests
diff --git a/test/shaping/tests/arabic-feature-order.tests b/test/shaping/tests/misc/arabic-feature-order.tests
similarity index 100%
rename from test/shaping/tests/arabic-feature-order.tests
rename to test/shaping/tests/misc/arabic-feature-order.tests
diff --git a/test/shaping/tests/arabic-like-joining.tests b/test/shaping/tests/misc/arabic-like-joining.tests
similarity index 100%
rename from test/shaping/tests/arabic-like-joining.tests
rename to test/shaping/tests/misc/arabic-like-joining.tests
diff --git a/test/shaping/tests/arabic-mark-order.tests b/test/shaping/tests/misc/arabic-mark-order.tests
similarity index 100%
rename from test/shaping/tests/arabic-mark-order.tests
rename to test/shaping/tests/misc/arabic-mark-order.tests
diff --git a/test/shaping/tests/arabic-stch.tests b/test/shaping/tests/misc/arabic-stch.tests
similarity index 100%
rename from test/shaping/tests/arabic-stch.tests
rename to test/shaping/tests/misc/arabic-stch.tests
diff --git a/test/shaping/tests/automatic-fractions.tests b/test/shaping/tests/misc/automatic-fractions.tests
similarity index 100%
rename from test/shaping/tests/automatic-fractions.tests
rename to test/shaping/tests/misc/automatic-fractions.tests
diff --git a/test/shaping/tests/cluster.tests b/test/shaping/tests/misc/cluster.tests
similarity index 100%
rename from test/shaping/tests/cluster.tests
rename to test/shaping/tests/misc/cluster.tests
diff --git a/test/shaping/tests/color-fonts.tests b/test/shaping/tests/misc/color-fonts.tests
similarity index 100%
rename from test/shaping/tests/color-fonts.tests
rename to test/shaping/tests/misc/color-fonts.tests
diff --git a/test/shaping/tests/context-matching.tests b/test/shaping/tests/misc/context-matching.tests
similarity index 100%
rename from test/shaping/tests/context-matching.tests
rename to test/shaping/tests/misc/context-matching.tests
diff --git a/test/shaping/tests/cursive-positioning.tests b/test/shaping/tests/misc/cursive-positioning.tests
similarity index 100%
rename from test/shaping/tests/cursive-positioning.tests
rename to test/shaping/tests/misc/cursive-positioning.tests
diff --git a/test/shaping/tests/default-ignorables.tests b/test/shaping/tests/misc/default-ignorables.tests
similarity index 100%
rename from test/shaping/tests/default-ignorables.tests
rename to test/shaping/tests/misc/default-ignorables.tests
diff --git a/test/shaping/tests/emoji-flag-tags.tests b/test/shaping/tests/misc/emoji-flag-tags.tests
similarity index 100%
rename from test/shaping/tests/emoji-flag-tags.tests
rename to test/shaping/tests/misc/emoji-flag-tags.tests
diff --git a/test/shaping/tests/fallback-positioning.tests b/test/shaping/tests/misc/fallback-positioning.tests
similarity index 100%
rename from test/shaping/tests/fallback-positioning.tests
rename to test/shaping/tests/misc/fallback-positioning.tests
diff --git a/test/shaping/tests/fuzzed.tests b/test/shaping/tests/misc/fuzzed.tests
similarity index 100%
rename from test/shaping/tests/fuzzed.tests
rename to test/shaping/tests/misc/fuzzed.tests
diff --git a/test/shaping/tests/hangul-jamo.tests b/test/shaping/tests/misc/hangul-jamo.tests
similarity index 100%
rename from test/shaping/tests/hangul-jamo.tests
rename to test/shaping/tests/misc/hangul-jamo.tests
diff --git a/test/shaping/tests/hyphens.tests b/test/shaping/tests/misc/hyphens.tests
similarity index 100%
rename from test/shaping/tests/hyphens.tests
rename to test/shaping/tests/misc/hyphens.tests
diff --git a/test/shaping/tests/indic-consonant-with-stacker.tests b/test/shaping/tests/misc/indic-consonant-with-stacker.tests
similarity index 100%
rename from test/shaping/tests/indic-consonant-with-stacker.tests
rename to test/shaping/tests/misc/indic-consonant-with-stacker.tests
diff --git a/test/shaping/tests/indic-init.tests b/test/shaping/tests/misc/indic-init.tests
similarity index 100%
rename from test/shaping/tests/indic-init.tests
rename to test/shaping/tests/misc/indic-init.tests
diff --git a/test/shaping/tests/indic-joiner-candrabindu.tests b/test/shaping/tests/misc/indic-joiner-candrabindu.tests
similarity index 100%
rename from test/shaping/tests/indic-joiner-candrabindu.tests
rename to test/shaping/tests/misc/indic-joiner-candrabindu.tests
diff --git a/test/shaping/tests/indic-joiners.tests b/test/shaping/tests/misc/indic-joiners.tests
similarity index 100%
rename from test/shaping/tests/indic-joiners.tests
rename to test/shaping/tests/misc/indic-joiners.tests
diff --git a/test/shaping/tests/indic-old-spec.tests b/test/shaping/tests/misc/indic-old-spec.tests
similarity index 100%
rename from test/shaping/tests/indic-old-spec.tests
rename to test/shaping/tests/misc/indic-old-spec.tests
diff --git a/test/shaping/tests/indic-pref-blocking.tests b/test/shaping/tests/misc/indic-pref-blocking.tests
similarity index 100%
rename from test/shaping/tests/indic-pref-blocking.tests
rename to test/shaping/tests/misc/indic-pref-blocking.tests
diff --git a/test/shaping/tests/indic-script-extensions.tests b/test/shaping/tests/misc/indic-script-extensions.tests
similarity index 100%
rename from test/shaping/tests/indic-script-extensions.tests
rename to test/shaping/tests/misc/indic-script-extensions.tests
diff --git a/test/shaping/tests/indic-special-cases.tests b/test/shaping/tests/misc/indic-special-cases.tests
similarity index 100%
rename from test/shaping/tests/indic-special-cases.tests
rename to test/shaping/tests/misc/indic-special-cases.tests
diff --git a/test/shaping/tests/indic-syllable.tests b/test/shaping/tests/misc/indic-syllable.tests
similarity index 100%
rename from test/shaping/tests/indic-syllable.tests
rename to test/shaping/tests/misc/indic-syllable.tests
diff --git a/test/shaping/tests/language-tags.tests b/test/shaping/tests/misc/language-tags.tests
similarity index 100%
rename from test/shaping/tests/language-tags.tests
rename to test/shaping/tests/misc/language-tags.tests
diff --git a/test/shaping/tests/ligature-id.tests b/test/shaping/tests/misc/ligature-id.tests
similarity index 100%
rename from test/shaping/tests/ligature-id.tests
rename to test/shaping/tests/misc/ligature-id.tests
diff --git a/test/shaping/tests/mark-attachment.tests b/test/shaping/tests/misc/mark-attachment.tests
similarity index 100%
rename from test/shaping/tests/mark-attachment.tests
rename to test/shaping/tests/misc/mark-attachment.tests
diff --git a/test/shaping/tests/mark-filtering-sets.tests b/test/shaping/tests/misc/mark-filtering-sets.tests
similarity index 100%
rename from test/shaping/tests/mark-filtering-sets.tests
rename to test/shaping/tests/misc/mark-filtering-sets.tests
diff --git a/test/shaping/tests/mongolian-variation-selector.tests b/test/shaping/tests/misc/mongolian-variation-selector.tests
similarity index 100%
rename from test/shaping/tests/mongolian-variation-selector.tests
rename to test/shaping/tests/misc/mongolian-variation-selector.tests
diff --git a/test/shaping/tests/simple.tests b/test/shaping/tests/misc/simple.tests
similarity index 100%
rename from test/shaping/tests/simple.tests
rename to test/shaping/tests/misc/simple.tests
diff --git a/test/shaping/tests/spaces.tests b/test/shaping/tests/misc/spaces.tests
similarity index 100%
rename from test/shaping/tests/spaces.tests
rename to test/shaping/tests/misc/spaces.tests
diff --git a/test/shaping/tests/tibetan-contractions-1.tests b/test/shaping/tests/misc/tibetan-contractions-1.tests
similarity index 100%
rename from test/shaping/tests/tibetan-contractions-1.tests
rename to test/shaping/tests/misc/tibetan-contractions-1.tests
diff --git a/test/shaping/tests/tibetan-contractions-2.tests b/test/shaping/tests/misc/tibetan-contractions-2.tests
similarity index 100%
rename from test/shaping/tests/tibetan-contractions-2.tests
rename to test/shaping/tests/misc/tibetan-contractions-2.tests
diff --git a/test/shaping/tests/tibetan-vowels.tests b/test/shaping/tests/misc/tibetan-vowels.tests
similarity index 100%
rename from test/shaping/tests/tibetan-vowels.tests
rename to test/shaping/tests/misc/tibetan-vowels.tests
diff --git a/test/shaping/tests/use-marchen.tests b/test/shaping/tests/misc/use-marchen.tests
similarity index 100%
rename from test/shaping/tests/use-marchen.tests
rename to test/shaping/tests/misc/use-marchen.tests
diff --git a/test/shaping/tests/use-syllable.tests b/test/shaping/tests/misc/use-syllable.tests
similarity index 100%
rename from test/shaping/tests/use-syllable.tests
rename to test/shaping/tests/misc/use-syllable.tests
diff --git a/test/shaping/tests/use.tests b/test/shaping/tests/misc/use.tests
similarity index 100%
rename from test/shaping/tests/use.tests
rename to test/shaping/tests/misc/use.tests
diff --git a/test/shaping/tests/variations-rvrn.tests b/test/shaping/tests/misc/variations-rvrn.tests
similarity index 100%
rename from test/shaping/tests/variations-rvrn.tests
rename to test/shaping/tests/misc/variations-rvrn.tests
diff --git a/test/shaping/tests/vertical.tests b/test/shaping/tests/misc/vertical.tests
similarity index 100%
rename from test/shaping/tests/vertical.tests
rename to test/shaping/tests/misc/vertical.tests
diff --git a/test/shaping/tests/zero-width-marks.tests b/test/shaping/tests/misc/zero-width-marks.tests
similarity index 100%
rename from test/shaping/tests/zero-width-marks.tests
rename to test/shaping/tests/misc/zero-width-marks.tests