diff --git a/test/core/cont.wast b/test/core/stack-switching/cont.wast
similarity index 99%
rename from test/core/cont.wast
rename to test/core/stack-switching/cont.wast
index 6c20349e99..cc84061ff0 100644
--- a/test/core/cont.wast
+++ b/test/core/stack-switching/cont.wast
@@ -654,6 +654,13 @@
   )
 )
 
+(module
+    (type $f1 (sub (func (result anyref))))
+    (type $f2 (sub $f1 (func (result eqref))))
+    (type $c1 (sub (cont $f1)))
+    (type $c2 (sub $c1 (cont $f2)))
+)
+
 ;; Globals
 (module
   (type $ft (func))
diff --git a/test/core/wasmfx_validation.wast b/test/core/stack-switching/validation.wast
similarity index 100%
rename from test/core/wasmfx_validation.wast
rename to test/core/stack-switching/validation.wast
diff --git a/test/core/wasmfx_validation_gc.wast b/test/core/stack-switching/validation_gc.wast
similarity index 100%
rename from test/core/wasmfx_validation_gc.wast
rename to test/core/stack-switching/validation_gc.wast