diff --git a/test/legacy/exceptions/rethrow.wast b/test/legacy/exceptions/core/rethrow.wast
similarity index 100%
rename from test/legacy/exceptions/rethrow.wast
rename to test/legacy/exceptions/core/rethrow.wast
diff --git a/test/legacy/run.py b/test/legacy/exceptions/core/run.py
similarity index 98%
rename from test/legacy/run.py
rename to test/legacy/exceptions/core/run.py
index f727aeef3..b2f6c314b 100755
--- a/test/legacy/run.py
+++ b/test/legacy/exceptions/core/run.py
@@ -23,7 +23,7 @@
 arguments = parser.parse_args()
 sys.argv = sys.argv[:1]
 
-exceptions_test_files = glob.glob(os.path.join(inputDir, "exceptions", "*.wast"))
+exceptions_test_files = glob.glob(os.path.join(inputDir, "*.wast"))
 
 wasmCommand = arguments.wasm
 jsCommand = arguments.js
diff --git a/test/legacy/exceptions/throw.wast b/test/legacy/exceptions/core/throw.wast
similarity index 100%
rename from test/legacy/exceptions/throw.wast
rename to test/legacy/exceptions/core/throw.wast
diff --git a/test/legacy/exceptions/try_catch.wast b/test/legacy/exceptions/core/try_catch.wast
similarity index 100%
rename from test/legacy/exceptions/try_catch.wast
rename to test/legacy/exceptions/core/try_catch.wast
diff --git a/test/legacy/exceptions/try_delegate.wast b/test/legacy/exceptions/core/try_delegate.wast
similarity index 100%
rename from test/legacy/exceptions/try_delegate.wast
rename to test/legacy/exceptions/core/try_delegate.wast
diff --git a/test/js-api/exception/basic.tentative.any.js b/test/legacy/exceptions/js-api/basic.tentative.any.js
similarity index 100%
rename from test/js-api/exception/basic.tentative.any.js
rename to test/legacy/exceptions/js-api/basic.tentative.any.js
diff --git a/test/js-api/exception/identity.tentative.any.js b/test/legacy/exceptions/js-api/identity.tentative.any.js
similarity index 100%
rename from test/js-api/exception/identity.tentative.any.js
rename to test/legacy/exceptions/js-api/identity.tentative.any.js