diff --git a/adapters/wasm2go.py b/adapters/wasm2go.py
new file mode 100644
index 000000000..f7f5e7c92
--- /dev/null
+++ b/adapters/wasm2go.py
@@ -0,0 +1,48 @@
+import os
+import shlex
+import subprocess
+from pathlib import Path
+from typing import Dict, List, Tuple
+
+WASM2GO_RUN: List[str] = shlex.split(os.getenv("WASM2GO_RUN", "wasm2go-run"))
+
+def get_name() -> str:
+    return "wasm2go"
+
+def get_version() -> str:
+    """Return the version of the wasm2go-run binary."""
+    return subprocess.run(
+        WASM2GO_RUN + ["--version"],
+        capture_output=True,
+        text=True,
+        check=True
+    ).stdout.strip()
+
+
+def get_wasi_versions() -> List[str]:
+    """Return the list of supported WASI versions."""
+    return ["wasm32-wasip1"]
+
+
+def get_wasi_worlds() -> List[str]:
+    """Return the list of supported WASI worlds."""
+    return ["wasi:cli/command"]
+
+
+def compute_argv(
+    test_path: str,
+    args_env_dirs: Tuple[List[str], Dict[str, str], List[Tuple[Path, str]]],
+    proposals: List[str],
+    wasi_world: str,
+    wasi_version: str
+) -> List[str]:
+    """Compute the command line arguments for running a WASM module with wasm2go-run."""
+    args, env, dirs = args_env_dirs
+    argv = list(WASM2GO_RUN)
+    for key, value in env.items():
+        argv.extend(["--env", f"{key}={value}"])
+    for host_path, guest_path in dirs:
+        argv.extend(["--dir", f"{host_path}::{guest_path}"])
+    argv.append(test_path)
+    argv.extend(args)
+    return argv
diff --git a/adapters/wasm2go_local.py b/adapters/wasm2go_local.py
new file mode 100644
index 000000000..1e6c58430
--- /dev/null
+++ b/adapters/wasm2go_local.py
@@ -0,0 +1 @@
+fatal: path 'adapters/wasm2go_local.py' exists on disk, but not in 'HEAD'
diff --git a/adapters/wasm2go_test.py b/adapters/wasm2go_test.py
new file mode 100644
index 000000000..dce56372e
--- /dev/null
+++ b/adapters/wasm2go_test.py
@@ -0,0 +1,59 @@
+import os
+import pytest
+from pathlib import Path
+from unittest.mock import patch, MagicMock
+from adapters import wasm2go
+
+def test_get_name():
+    assert wasm2go.get_name() == "wasm2go"
+
+def test_get_wasi_versions():
+    assert wasm2go.get_wasi_versions() == ["wasm32-wasip1"]
+
+def test_get_wasi_worlds():
+    assert wasm2go.get_wasi_worlds() == ["wasi:cli/command"]
+
+def test_compute_argv_basic():
+    test_path = "foo.wasm"
+    args = ["a"]
+    env = {"K": "V"}
+    dirs = [(Path("/h"), "g")]
+    proposals = []
+    wasi_world = "wasi:cli/command"
+    wasi_version = "wasm32-wasip1"
+
+    argv = wasm2go.compute_argv(test_path, (args, env, dirs), proposals, wasi_world, wasi_version)
+    
+    expected = ["wasm2go-run", "--env", "K=V", "--dir", "/h::g", "foo.wasm", "a"]
+    assert argv == expected
+
+def test_compute_argv_with_env_override():
+    from pathlib import Path
+    import adapters.wasm2go as wasm2go
+    with patch.object(wasm2go, "WASM2GO_RUN", ["my-runner"]):
+        argv = wasm2go.compute_argv("foo.wasm", ([], {}, []), [], "wasi:cli/command", "wasm32-wasip1")
+        assert argv[0] == "my-runner"
+
+@patch("subprocess.run")
+def test_get_version_with_multi_token_prefix(mock_run):
+    mock_run.return_value = MagicMock(stdout="v1.2.3\n")
+    
+    with patch.object(wasm2go, "WASM2GO_RUN", ["sudo", "-u", "nobody", "wasm2go-run"]):
+        version = wasm2go.get_version()
+        
+    assert version == "v1.2.3"
+    expected_args = ["sudo", "-u", "nobody", "wasm2go-run", "--version"]
+    mock_run.assert_called_once_with(
+        expected_args,
+        capture_output=True,
+        text=True,
+        check=True
+    )
+
+@patch("subprocess.run")
+def test_get_version(mock_run):
+    mock_run.return_value = MagicMock(stdout="wasm2go-run version 0.1.0\n")
+    version = wasm2go.get_version()
+    assert version == "wasm2go-run version 0.1.0"
+    mock_run.assert_called_once()
+    assert mock_run.call_args.args[0] == wasm2go.WASM2GO_RUN + ["--version"]
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/args_get-multiple-arguments.json b/tests/assemblyscript/testsuite/wasm32-wasip1/args_get-multiple-arguments.json
new file mode 100644
index 000000000..c6e4b5f7a
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/args_get-multiple-arguments.json
@@ -0,0 +1,3 @@
+{
+    "args": ["first", "the \"second\" arg", "3"]
+}
\ No newline at end of file
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/args_get-multiple-arguments.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/args_get-multiple-arguments.wasm
new file mode 100644
index 000000000..9afed1976
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/args_get-multiple-arguments.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-multiple-arguments.json b/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-multiple-arguments.json
new file mode 100644
index 000000000..c6e4b5f7a
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-multiple-arguments.json
@@ -0,0 +1,3 @@
+{
+    "args": ["first", "the \"second\" arg", "3"]
+}
\ No newline at end of file
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-multiple-arguments.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-multiple-arguments.wasm
new file mode 100644
index 000000000..d8763caf3
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-multiple-arguments.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-no-arguments.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-no-arguments.wasm
new file mode 100644
index 000000000..e45538798
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/args_sizes_get-no-arguments.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/environ_get-multiple-variables.json b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_get-multiple-variables.json
new file mode 100644
index 000000000..64ef42def
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_get-multiple-variables.json
@@ -0,0 +1,7 @@
+{
+    "env": {
+        "a": "text",
+        "b": "escap \" ing",
+        "c": "new\nline"
+    }
+}
\ No newline at end of file
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/environ_get-multiple-variables.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_get-multiple-variables.wasm
new file mode 100644
index 000000000..c1eba6021
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_get-multiple-variables.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-multiple-variables.json b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-multiple-variables.json
new file mode 100644
index 000000000..e56f4c5ff
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-multiple-variables.json
@@ -0,0 +1,7 @@
+{
+    "env": {
+        "a": "b",
+        "b": "c",
+        "c": "d"
+    }
+}
\ No newline at end of file
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-multiple-variables.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-multiple-variables.wasm
new file mode 100644
index 000000000..13335f7f5
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-multiple-variables.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-no-variables.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-no-variables.wasm
new file mode 100644
index 000000000..dd14936c8
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/environ_sizes_get-no-variables.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-invalid-fd.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-invalid-fd.wasm
new file mode 100644
index 000000000..cb41ffb1b
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-invalid-fd.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-stdout.json b/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-stdout.json
new file mode 100644
index 000000000..baa87f9f5
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-stdout.json
@@ -0,0 +1,3 @@
+{
+    "stdout": "hello"
+}
\ No newline at end of file
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-stdout.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-stdout.wasm
new file mode 100644
index 000000000..12e1414ad
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/fd_write-to-stdout.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/manifest.json b/tests/assemblyscript/testsuite/wasm32-wasip1/manifest.json
new file mode 100644
index 000000000..1d083d6c7
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/manifest.json
@@ -0,0 +1 @@
+{"name": "WASI Assemblyscript  tests [wasm32-wasip1]"}
\ No newline at end of file
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-failure.json b/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-failure.json
new file mode 100644
index 000000000..f781a01d0
--- /dev/null
+++ b/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-failure.json
@@ -0,0 +1,3 @@
+{
+    "exit_code": 33
+}
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-failure.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-failure.wasm
new file mode 100644
index 000000000..93c9d8617
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-failure.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-success.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-success.wasm
new file mode 100644
index 000000000..a6dd74ac8
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/proc_exit-success.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/random_get-non-zero-length.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/random_get-non-zero-length.wasm
new file mode 100644
index 000000000..f4358831d
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/random_get-non-zero-length.wasm differ
diff --git a/tests/assemblyscript/testsuite/wasm32-wasip1/random_get-zero-length.wasm b/tests/assemblyscript/testsuite/wasm32-wasip1/random_get-zero-length.wasm
new file mode 100644
index 000000000..ca06e09f1
Binary files /dev/null and b/tests/assemblyscript/testsuite/wasm32-wasip1/random_get-zero-length.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/clock_getres-monotonic.wasm b/tests/c/testsuite/wasm32-wasip1/clock_getres-monotonic.wasm
new file mode 100644
index 000000000..3d42922d0
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/clock_getres-monotonic.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/clock_getres-realtime.wasm b/tests/c/testsuite/wasm32-wasip1/clock_getres-realtime.wasm
new file mode 100644
index 000000000..9b0e90d91
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/clock_getres-realtime.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/clock_gettime-monotonic.wasm b/tests/c/testsuite/wasm32-wasip1/clock_gettime-monotonic.wasm
new file mode 100644
index 000000000..8003fb64c
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/clock_gettime-monotonic.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/clock_gettime-realtime.wasm b/tests/c/testsuite/wasm32-wasip1/clock_gettime-realtime.wasm
new file mode 100644
index 000000000..fef3fd6ed
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/clock_gettime-realtime.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/fdopendir-with-access.json b/tests/c/testsuite/wasm32-wasip1/fdopendir-with-access.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/fdopendir-with-access.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/fdopendir-with-access.wasm b/tests/c/testsuite/wasm32-wasip1/fdopendir-with-access.wasm
new file mode 100644
index 000000000..5bb7f7ec2
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/fdopendir-with-access.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/fopen-with-access.json b/tests/c/testsuite/wasm32-wasip1/fopen-with-access.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/fopen-with-access.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/fopen-with-access.wasm b/tests/c/testsuite/wasm32-wasip1/fopen-with-access.wasm
new file mode 100644
index 000000000..018fcd480
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/fopen-with-access.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/fopen-with-no-access.wasm b/tests/c/testsuite/wasm32-wasip1/fopen-with-no-access.wasm
new file mode 100644
index 000000000..c0c90a8a1
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/fopen-with-no-access.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/file b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/file
new file mode 100644
index 000000000..c57eff55e
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/file
@@ -0,0 +1 @@
+Hello World!
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/fopendir.dir/file-0 b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/fopendir.dir/file-0
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/fopendir.dir/file-1 b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/fopendir.dir/file-1
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/lseek.txt b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/lseek.txt
new file mode 100644
index 000000000..6f06f4081
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/lseek.txt
@@ -0,0 +1 @@
+01234567
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/pread.txt b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/pread.txt
new file mode 100644
index 000000000..f64fe53f6
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/pread.txt
@@ -0,0 +1 @@
+pread-test
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/writeable/.gitignore b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/writeable/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/fs-tests.dir/writeable/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/c/testsuite/wasm32-wasip1/lseek.json b/tests/c/testsuite/wasm32-wasip1/lseek.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/lseek.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/lseek.wasm b/tests/c/testsuite/wasm32-wasip1/lseek.wasm
new file mode 100644
index 000000000..0d1cd1715
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/lseek.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/manifest.json b/tests/c/testsuite/wasm32-wasip1/manifest.json
new file mode 100644
index 000000000..a2ba708b1
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/manifest.json
@@ -0,0 +1 @@
+{"name": "WASI C tests [wasm32-wasip1]"}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/pread-with-access.json b/tests/c/testsuite/wasm32-wasip1/pread-with-access.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/pread-with-access.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/pread-with-access.wasm b/tests/c/testsuite/wasm32-wasip1/pread-with-access.wasm
new file mode 100644
index 000000000..f0b92b537
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/pread-with-access.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/pwrite-with-access.json b/tests/c/testsuite/wasm32-wasip1/pwrite-with-access.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/pwrite-with-access.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/pwrite-with-access.wasm b/tests/c/testsuite/wasm32-wasip1/pwrite-with-access.wasm
new file mode 100644
index 000000000..adcd3968d
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/pwrite-with-access.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/pwrite-with-append.json b/tests/c/testsuite/wasm32-wasip1/pwrite-with-append.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/pwrite-with-append.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/pwrite-with-append.wasm b/tests/c/testsuite/wasm32-wasip1/pwrite-with-append.wasm
new file mode 100644
index 000000000..862295391
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/pwrite-with-append.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/sock_shutdown-invalid_fd.wasm b/tests/c/testsuite/wasm32-wasip1/sock_shutdown-invalid_fd.wasm
new file mode 100644
index 000000000..b6d0cdbb3
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/sock_shutdown-invalid_fd.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/sock_shutdown-not_sock.wasm b/tests/c/testsuite/wasm32-wasip1/sock_shutdown-not_sock.wasm
new file mode 100644
index 000000000..fe619db1b
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/sock_shutdown-not_sock.wasm differ
diff --git a/tests/c/testsuite/wasm32-wasip1/stat-dev-ino.json b/tests/c/testsuite/wasm32-wasip1/stat-dev-ino.json
new file mode 100644
index 000000000..e556f9f11
--- /dev/null
+++ b/tests/c/testsuite/wasm32-wasip1/stat-dev-ino.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/c/testsuite/wasm32-wasip1/stat-dev-ino.wasm b/tests/c/testsuite/wasm32-wasip1/stat-dev-ino.wasm
new file mode 100644
index 000000000..2e8a98d2b
Binary files /dev/null and b/tests/c/testsuite/wasm32-wasip1/stat-dev-ino.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/big_random_buf.wasm b/tests/rust/testsuite/wasm32-wasip1/big_random_buf.wasm
new file mode 100755
index 000000000..45806e451
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/big_random_buf.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/clock_time_get.wasm b/tests/rust/testsuite/wasm32-wasip1/clock_time_get.wasm
new file mode 100755
index 000000000..80ad85791
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/clock_time_get.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/close_preopen.json b/tests/rust/testsuite/wasm32-wasip1/close_preopen.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/close_preopen.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/close_preopen.wasm b/tests/rust/testsuite/wasm32-wasip1/close_preopen.wasm
new file mode 100755
index 000000000..9ab9dba52
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/close_preopen.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/dangling_fd.json b/tests/rust/testsuite/wasm32-wasip1/dangling_fd.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/dangling_fd.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/dangling_fd.wasm b/tests/rust/testsuite/wasm32-wasip1/dangling_fd.wasm
new file mode 100755
index 000000000..2ddbdef71
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/dangling_fd.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/dangling_symlink.json b/tests/rust/testsuite/wasm32-wasip1/dangling_symlink.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/dangling_symlink.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/dangling_symlink.wasm b/tests/rust/testsuite/wasm32-wasip1/dangling_symlink.wasm
new file mode 100755
index 000000000..104487636
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/dangling_symlink.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/dir_fd_op_failures.json b/tests/rust/testsuite/wasm32-wasip1/dir_fd_op_failures.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/dir_fd_op_failures.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/dir_fd_op_failures.wasm b/tests/rust/testsuite/wasm32-wasip1/dir_fd_op_failures.wasm
new file mode 100755
index 000000000..70e4b043d
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/dir_fd_op_failures.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/directory_seek.json b/tests/rust/testsuite/wasm32-wasip1/directory_seek.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/directory_seek.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/directory_seek.wasm b/tests/rust/testsuite/wasm32-wasip1/directory_seek.wasm
new file mode 100755
index 000000000..09021ec27
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/directory_seek.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_advise.json b/tests/rust/testsuite/wasm32-wasip1/fd_advise.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/fd_advise.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_advise.wasm b/tests/rust/testsuite/wasm32-wasip1/fd_advise.wasm
new file mode 100755
index 000000000..fc3a59ad2
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/fd_advise.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_fdstat_set_rights.json b/tests/rust/testsuite/wasm32-wasip1/fd_fdstat_set_rights.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/fd_fdstat_set_rights.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_fdstat_set_rights.wasm b/tests/rust/testsuite/wasm32-wasip1/fd_fdstat_set_rights.wasm
new file mode 100755
index 000000000..04c4a9157
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/fd_fdstat_set_rights.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_filestat_set.json b/tests/rust/testsuite/wasm32-wasip1/fd_filestat_set.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/fd_filestat_set.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_filestat_set.wasm b/tests/rust/testsuite/wasm32-wasip1/fd_filestat_set.wasm
new file mode 100755
index 000000000..880ae9fc6
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/fd_filestat_set.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_flags_set.json b/tests/rust/testsuite/wasm32-wasip1/fd_flags_set.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/fd_flags_set.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_flags_set.wasm b/tests/rust/testsuite/wasm32-wasip1/fd_flags_set.wasm
new file mode 100755
index 000000000..dc1c893ba
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/fd_flags_set.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_readdir.json b/tests/rust/testsuite/wasm32-wasip1/fd_readdir.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/fd_readdir.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/fd_readdir.wasm b/tests/rust/testsuite/wasm32-wasip1/fd_readdir.wasm
new file mode 100755
index 000000000..1cb8dff83
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/fd_readdir.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_allocate.json b/tests/rust/testsuite/wasm32-wasip1/file_allocate.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/file_allocate.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_allocate.wasm b/tests/rust/testsuite/wasm32-wasip1/file_allocate.wasm
new file mode 100755
index 000000000..c50293a5d
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/file_allocate.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_pread_pwrite.json b/tests/rust/testsuite/wasm32-wasip1/file_pread_pwrite.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/file_pread_pwrite.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_pread_pwrite.wasm b/tests/rust/testsuite/wasm32-wasip1/file_pread_pwrite.wasm
new file mode 100755
index 000000000..8b0dd4d6a
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/file_pread_pwrite.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_seek_tell.json b/tests/rust/testsuite/wasm32-wasip1/file_seek_tell.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/file_seek_tell.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_seek_tell.wasm b/tests/rust/testsuite/wasm32-wasip1/file_seek_tell.wasm
new file mode 100755
index 000000000..b42d0959b
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/file_seek_tell.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_truncation.json b/tests/rust/testsuite/wasm32-wasip1/file_truncation.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/file_truncation.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_truncation.wasm b/tests/rust/testsuite/wasm32-wasip1/file_truncation.wasm
new file mode 100755
index 000000000..22ce38164
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/file_truncation.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_unbuffered_write.json b/tests/rust/testsuite/wasm32-wasip1/file_unbuffered_write.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/file_unbuffered_write.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/file_unbuffered_write.wasm b/tests/rust/testsuite/wasm32-wasip1/file_unbuffered_write.wasm
new file mode 100755
index 000000000..63118928c
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/file_unbuffered_write.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/fs-tests.dir/.keep b/tests/rust/testsuite/wasm32-wasip1/fs-tests.dir/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/rust/testsuite/wasm32-wasip1/fstflags_validate.json b/tests/rust/testsuite/wasm32-wasip1/fstflags_validate.json
new file mode 100644
index 000000000..e5b9e6e3e
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/fstflags_validate.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip1/fstflags_validate.wasm b/tests/rust/testsuite/wasm32-wasip1/fstflags_validate.wasm
new file mode 100755
index 000000000..320c41ae9
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/fstflags_validate.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/interesting_paths.json b/tests/rust/testsuite/wasm32-wasip1/interesting_paths.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/interesting_paths.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/interesting_paths.wasm b/tests/rust/testsuite/wasm32-wasip1/interesting_paths.wasm
new file mode 100755
index 000000000..4f0138423
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/interesting_paths.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/isatty.json b/tests/rust/testsuite/wasm32-wasip1/isatty.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/isatty.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/isatty.wasm b/tests/rust/testsuite/wasm32-wasip1/isatty.wasm
new file mode 100755
index 000000000..0883a949c
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/isatty.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/manifest.json b/tests/rust/testsuite/wasm32-wasip1/manifest.json
new file mode 100644
index 000000000..c2bfecadd
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/manifest.json
@@ -0,0 +1 @@
+{"name": "WASI Rust tests [wasm32-wasip1]"}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/nofollow_errors.json b/tests/rust/testsuite/wasm32-wasip1/nofollow_errors.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/nofollow_errors.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/nofollow_errors.wasm b/tests/rust/testsuite/wasm32-wasip1/nofollow_errors.wasm
new file mode 100755
index 000000000..9b6245bf0
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/nofollow_errors.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/overwrite_preopen.json b/tests/rust/testsuite/wasm32-wasip1/overwrite_preopen.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/overwrite_preopen.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/overwrite_preopen.wasm b/tests/rust/testsuite/wasm32-wasip1/overwrite_preopen.wasm
new file mode 100755
index 000000000..d0ddb6a30
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/overwrite_preopen.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_exists.json b/tests/rust/testsuite/wasm32-wasip1/path_exists.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_exists.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_exists.wasm b/tests/rust/testsuite/wasm32-wasip1/path_exists.wasm
new file mode 100755
index 000000000..1b0d07651
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_exists.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_filestat.json b/tests/rust/testsuite/wasm32-wasip1/path_filestat.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_filestat.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_filestat.wasm b/tests/rust/testsuite/wasm32-wasip1/path_filestat.wasm
new file mode 100755
index 000000000..88f3ea5cb
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_filestat.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_link.json b/tests/rust/testsuite/wasm32-wasip1/path_link.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_link.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_link.wasm b/tests/rust/testsuite/wasm32-wasip1/path_link.wasm
new file mode 100755
index 000000000..ffd0b0a13
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_link.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_create_existing.json b/tests/rust/testsuite/wasm32-wasip1/path_open_create_existing.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_open_create_existing.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_create_existing.wasm b/tests/rust/testsuite/wasm32-wasip1/path_open_create_existing.wasm
new file mode 100755
index 000000000..ff2e56ae5
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_open_create_existing.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_dirfd_not_dir.json b/tests/rust/testsuite/wasm32-wasip1/path_open_dirfd_not_dir.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_open_dirfd_not_dir.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_dirfd_not_dir.wasm b/tests/rust/testsuite/wasm32-wasip1/path_open_dirfd_not_dir.wasm
new file mode 100755
index 000000000..a6f3224b2
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_open_dirfd_not_dir.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_missing.json b/tests/rust/testsuite/wasm32-wasip1/path_open_missing.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_open_missing.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_missing.wasm b/tests/rust/testsuite/wasm32-wasip1/path_open_missing.wasm
new file mode 100755
index 000000000..cc9dec713
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_open_missing.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_nonblock.json b/tests/rust/testsuite/wasm32-wasip1/path_open_nonblock.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_open_nonblock.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_nonblock.wasm b/tests/rust/testsuite/wasm32-wasip1/path_open_nonblock.wasm
new file mode 100755
index 000000000..5754df820
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_open_nonblock.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_preopen.json b/tests/rust/testsuite/wasm32-wasip1/path_open_preopen.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_open_preopen.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_preopen.wasm b/tests/rust/testsuite/wasm32-wasip1/path_open_preopen.wasm
new file mode 100755
index 000000000..d7bd2af2f
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_open_preopen.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_read_write.json b/tests/rust/testsuite/wasm32-wasip1/path_open_read_write.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_open_read_write.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_open_read_write.wasm b/tests/rust/testsuite/wasm32-wasip1/path_open_read_write.wasm
new file mode 100755
index 000000000..5c4e4982a
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_open_read_write.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_rename.json b/tests/rust/testsuite/wasm32-wasip1/path_rename.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_rename.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_rename.wasm b/tests/rust/testsuite/wasm32-wasip1/path_rename.wasm
new file mode 100755
index 000000000..65dce08f6
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_rename.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_rename_dir_trailing_slashes.json b/tests/rust/testsuite/wasm32-wasip1/path_rename_dir_trailing_slashes.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_rename_dir_trailing_slashes.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_rename_dir_trailing_slashes.wasm b/tests/rust/testsuite/wasm32-wasip1/path_rename_dir_trailing_slashes.wasm
new file mode 100755
index 000000000..07ecb8ce6
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_rename_dir_trailing_slashes.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_symlink_trailing_slashes.json b/tests/rust/testsuite/wasm32-wasip1/path_symlink_trailing_slashes.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/path_symlink_trailing_slashes.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/path_symlink_trailing_slashes.wasm b/tests/rust/testsuite/wasm32-wasip1/path_symlink_trailing_slashes.wasm
new file mode 100755
index 000000000..e3b9c877a
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/path_symlink_trailing_slashes.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/poll_oneoff_stdio.wasm b/tests/rust/testsuite/wasm32-wasip1/poll_oneoff_stdio.wasm
new file mode 100755
index 000000000..3e829de77
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/poll_oneoff_stdio.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/readlink.json b/tests/rust/testsuite/wasm32-wasip1/readlink.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/readlink.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/readlink.wasm b/tests/rust/testsuite/wasm32-wasip1/readlink.wasm
new file mode 100755
index 000000000..ed4404c9c
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/readlink.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/remove_directory_trailing_slashes.json b/tests/rust/testsuite/wasm32-wasip1/remove_directory_trailing_slashes.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/remove_directory_trailing_slashes.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/remove_directory_trailing_slashes.wasm b/tests/rust/testsuite/wasm32-wasip1/remove_directory_trailing_slashes.wasm
new file mode 100755
index 000000000..a097c70ee
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/remove_directory_trailing_slashes.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/remove_nonempty_directory.json b/tests/rust/testsuite/wasm32-wasip1/remove_nonempty_directory.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/remove_nonempty_directory.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/remove_nonempty_directory.wasm b/tests/rust/testsuite/wasm32-wasip1/remove_nonempty_directory.wasm
new file mode 100755
index 000000000..3459660e6
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/remove_nonempty_directory.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/renumber.json b/tests/rust/testsuite/wasm32-wasip1/renumber.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/renumber.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/renumber.wasm b/tests/rust/testsuite/wasm32-wasip1/renumber.wasm
new file mode 100755
index 000000000..5e0d04ff7
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/renumber.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/sched_yield.wasm b/tests/rust/testsuite/wasm32-wasip1/sched_yield.wasm
new file mode 100755
index 000000000..1e09f706a
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/sched_yield.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/stdio.json b/tests/rust/testsuite/wasm32-wasip1/stdio.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/stdio.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/stdio.wasm b/tests/rust/testsuite/wasm32-wasip1/stdio.wasm
new file mode 100755
index 000000000..0762a3d44
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/stdio.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/symlink_create.json b/tests/rust/testsuite/wasm32-wasip1/symlink_create.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/symlink_create.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/symlink_create.wasm b/tests/rust/testsuite/wasm32-wasip1/symlink_create.wasm
new file mode 100755
index 000000000..2e02fce45
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/symlink_create.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/symlink_filestat.json b/tests/rust/testsuite/wasm32-wasip1/symlink_filestat.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/symlink_filestat.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/symlink_filestat.wasm b/tests/rust/testsuite/wasm32-wasip1/symlink_filestat.wasm
new file mode 100755
index 000000000..32c59c425
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/symlink_filestat.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/symlink_loop.json b/tests/rust/testsuite/wasm32-wasip1/symlink_loop.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/symlink_loop.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/symlink_loop.wasm b/tests/rust/testsuite/wasm32-wasip1/symlink_loop.wasm
new file mode 100755
index 000000000..43b61c3a8
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/symlink_loop.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/truncation_rights.json b/tests/rust/testsuite/wasm32-wasip1/truncation_rights.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/truncation_rights.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/truncation_rights.wasm b/tests/rust/testsuite/wasm32-wasip1/truncation_rights.wasm
new file mode 100755
index 000000000..53b19ce1c
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/truncation_rights.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip1/unlink_file_trailing_slashes.json b/tests/rust/testsuite/wasm32-wasip1/unlink_file_trailing_slashes.json
new file mode 100644
index 000000000..ef0837961
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip1/unlink_file_trailing_slashes.json
@@ -0,0 +1,4 @@
+{
+    "dirs": ["fs-tests.dir"],
+    "args": ["fs-tests.dir"]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip1/unlink_file_trailing_slashes.wasm b/tests/rust/testsuite/wasm32-wasip1/unlink_file_trailing_slashes.wasm
new file mode 100755
index 000000000..cb4123a23
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip1/unlink_file_trailing_slashes.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-env.json b/tests/rust/testsuite/wasm32-wasip3/cli-env.json
new file mode 100644
index 000000000..74056aa73
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/cli-env.json
@@ -0,0 +1,19 @@
+{
+  "operations": [
+    {
+      "type": "run",
+      "env": {
+        "foo": "bar",
+        "baz": "42"
+      },
+      "args": [
+        "a",
+        "b",
+        "42"
+      ]
+    },
+    {
+        "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-env.wasm b/tests/rust/testsuite/wasm32-wasip3/cli-env.wasm
new file mode 100644
index 000000000..cd00ba5d7
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/cli-env.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-exit.json b/tests/rust/testsuite/wasm32-wasip3/cli-exit.json
new file mode 100644
index 000000000..077486c15
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/cli-exit.json
@@ -0,0 +1,11 @@
+{
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait",
+      "exit_code": 1
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-exit.wasm b/tests/rust/testsuite/wasm32-wasip3/cli-exit.wasm
new file mode 100644
index 000000000..e4416a9ac
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/cli-exit.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-stdio-roundtrip.json b/tests/rust/testsuite/wasm32-wasip3/cli-stdio-roundtrip.json
new file mode 100644
index 000000000..0ab50ca3e
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/cli-stdio-roundtrip.json
@@ -0,0 +1,25 @@
+{
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "write",
+      "id": "stdin",
+      "payload": "Hello, world!"
+    },
+    {
+      "type": "read",
+      "id": "stdout",
+      "payload": "Hello, world!"
+    },
+    {
+      "type": "read",
+      "id": "stderr",
+      "payload": "Hello, world!"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-stdio-roundtrip.wasm b/tests/rust/testsuite/wasm32-wasip3/cli-stdio-roundtrip.wasm
new file mode 100644
index 000000000..2b5708e13
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/cli-stdio-roundtrip.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-stdio.wasm b/tests/rust/testsuite/wasm32-wasip3/cli-stdio.wasm
new file mode 100644
index 000000000..1603c0de1
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/cli-stdio.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/cli-terminal.wasm b/tests/rust/testsuite/wasm32-wasip3/cli-terminal.wasm
new file mode 100644
index 000000000..b1a7ec416
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/cli-terminal.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-advise.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-advise.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-advise.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-advise.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-advise.wasm
new file mode 100644
index 000000000..4b139d0b9
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-advise.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-dotdot.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-dotdot.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-dotdot.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-dotdot.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-dotdot.wasm
new file mode 100644
index 000000000..cdc8a1631
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-dotdot.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-flags-and-type.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-flags-and-type.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-flags-and-type.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-flags-and-type.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-flags-and-type.wasm
new file mode 100644
index 000000000..2e4a5b43e
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-flags-and-type.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-hard-links.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-hard-links.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-hard-links.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-hard-links.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-hard-links.wasm
new file mode 100644
index 000000000..e51bc3ce1
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-hard-links.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-io.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-io.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-io.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-io.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-io.wasm
new file mode 100644
index 000000000..e73e95ffe
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-io.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-is-same-object.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-is-same-object.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-is-same-object.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-is-same-object.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-is-same-object.wasm
new file mode 100644
index 000000000..ac65f0901
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-is-same-object.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-metadata-hash.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-metadata-hash.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-metadata-hash.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-metadata-hash.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-metadata-hash.wasm
new file mode 100644
index 000000000..550ffffe1
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-metadata-hash.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-mkdir-rmdir.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-mkdir-rmdir.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-mkdir-rmdir.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-mkdir-rmdir.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-mkdir-rmdir.wasm
new file mode 100644
index 000000000..7e44a0499
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-mkdir-rmdir.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-open-errors.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-open-errors.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-open-errors.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-open-errors.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-open-errors.wasm
new file mode 100644
index 000000000..8a5cab374
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-open-errors.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-read-directory.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-read-directory.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-read-directory.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-read-directory.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-read-directory.wasm
new file mode 100644
index 000000000..33f818204
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-read-directory.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-rename.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-rename.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-rename.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-rename.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-rename.wasm
new file mode 100644
index 000000000..44bd10408
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-rename.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-set-size.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-set-size.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-set-size.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-set-size.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-set-size.wasm
new file mode 100644
index 000000000..5737d1563
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-set-size.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-stat.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-stat.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-stat.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-stat.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-stat.wasm
new file mode 100644
index 000000000..a1b032909
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-stat.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-unlink-errors.json b/tests/rust/testsuite/wasm32-wasip3/filesystem-unlink-errors.json
new file mode 100644
index 000000000..ff216a756
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/filesystem-unlink-errors.json
@@ -0,0 +1,3 @@
+{
+    "dirs": ["fs-tests.dir"]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/filesystem-unlink-errors.wasm b/tests/rust/testsuite/wasm32-wasip3/filesystem-unlink-errors.wasm
new file mode 100644
index 000000000..44cd6cc0f
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/filesystem-unlink-errors.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/a.txt b/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/a.txt
new file mode 100644
index 000000000..ff43381aa
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/a.txt
@@ -0,0 +1 @@
+test-a
diff --git a/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/b.txt b/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/b.txt
new file mode 100644
index 000000000..7b5cf3217
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/b.txt
@@ -0,0 +1 @@
+test-b
diff --git a/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/parent b/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/parent
new file mode 120000
index 000000000..a96aa0ea9
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/fs-tests.dir/parent
@@ -0,0 +1 @@
+..
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-fields.json b/tests/rust/testsuite/wasm32-wasip3/http-fields.json
new file mode 100644
index 000000000..141f45e41
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/http-fields.json
@@ -0,0 +1,11 @@
+{
+    "proposals": ["http"],
+    "operations": [
+	{
+	    "type": "run"
+	},
+	{
+	    "type": "wait"
+	}
+    ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-fields.wasm b/tests/rust/testsuite/wasm32-wasip3/http-fields.wasm
new file mode 100644
index 000000000..c1ccab3bb
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/http-fields.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-request.json b/tests/rust/testsuite/wasm32-wasip3/http-request.json
new file mode 100644
index 000000000..141f45e41
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/http-request.json
@@ -0,0 +1,11 @@
+{
+    "proposals": ["http"],
+    "operations": [
+	{
+	    "type": "run"
+	},
+	{
+	    "type": "wait"
+	}
+    ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-request.wasm b/tests/rust/testsuite/wasm32-wasip3/http-request.wasm
new file mode 100644
index 000000000..3dc374e02
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/http-request.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-response.json b/tests/rust/testsuite/wasm32-wasip3/http-response.json
new file mode 100644
index 000000000..141f45e41
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/http-response.json
@@ -0,0 +1,11 @@
+{
+    "proposals": ["http"],
+    "operations": [
+	{
+	    "type": "run"
+	},
+	{
+	    "type": "wait"
+	}
+    ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-response.wasm b/tests/rust/testsuite/wasm32-wasip3/http-response.wasm
new file mode 100644
index 000000000..6824622e1
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/http-response.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-service.json b/tests/rust/testsuite/wasm32-wasip3/http-service.json
new file mode 100644
index 000000000..5a24da6c1
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/http-service.json
@@ -0,0 +1,29 @@
+{
+  "proposals": ["http"],
+  "world": "wasi:http/service",
+  "operations": [
+    { "type": "run" },
+    { "type": "request",
+      "method": "GET",
+      "path": "/",
+      "response": { "status": 200,
+                    "headers": { "content-type": "text/plain" },
+                    "body": "hey\n" } },
+    { "type": "request",
+      "method": "GET",
+      "path": "/",
+      "response": { "status": 200,
+                    "headers": { "content-type": "text/plain" },
+                    "body": "hey\n" } },
+    { "type": "request",
+      "method": "GET",
+      "path": "/whatever",
+      "response": { "status": 404 } },
+    { "type": "request",
+      "method": "POST",
+      "path": "/whatever",
+      "response": { "status": 405 } },
+    { "type": "kill", "signal": "SIGINT" },
+    { "type": "wait" }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/http-service.wasm b/tests/rust/testsuite/wasm32-wasip3/http-service.wasm
new file mode 100644
index 000000000..81dadf000
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/http-service.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/manifest.json b/tests/rust/testsuite/wasm32-wasip3/manifest.json
new file mode 100644
index 000000000..e5c599b39
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/manifest.json
@@ -0,0 +1 @@
+{"name": "WASI Rust tests [wasm32-wasip3]"}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip3/monotonic-clock.wasm b/tests/rust/testsuite/wasm32-wasip3/monotonic-clock.wasm
new file mode 100644
index 000000000..c9265437d
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/monotonic-clock.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/multi-clock-wait.wasm b/tests/rust/testsuite/wasm32-wasip3/multi-clock-wait.wasm
new file mode 100644
index 000000000..579c64b0b
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/multi-clock-wait.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/random.wasm b/tests/rust/testsuite/wasm32-wasip3/random.wasm
new file mode 100644
index 000000000..1bc7b8bba
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/random.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/run-with-err.json b/tests/rust/testsuite/wasm32-wasip3/run-with-err.json
new file mode 100644
index 000000000..077486c15
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/run-with-err.json
@@ -0,0 +1,11 @@
+{
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait",
+      "exit_code": 1
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/run-with-err.wasm b/tests/rust/testsuite/wasm32-wasip3/run-with-err.wasm
new file mode 100644
index 000000000..39cf86b90
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/run-with-err.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-echo.json b/tests/rust/testsuite/wasm32-wasip3/sockets-echo.json
new file mode 100644
index 000000000..e8ef7d126
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-echo.json
@@ -0,0 +1,28 @@
+{
+    "proposals": [
+	"sockets"
+    ],
+    "operations": [
+	{
+	    "type": "run"
+	},
+	{
+	    "type": "connect",
+	    "id": "echo-server",
+	    "protocol_type": "tcp"
+	},
+	{
+	    "type": "send",
+	    "id": "echo-server",
+	    "payload": "Hello, world"
+	},
+	{
+	    "type": "recv",
+	    "id": "echo-server",
+	    "payload": "Hello, world"
+	},
+	{
+	    "type": "wait"
+	}
+    ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-echo.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-echo.wasm
new file mode 100644
index 000000000..c3a10cd81
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-echo.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-bind.json b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-bind.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-bind.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-bind.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-bind.wasm
new file mode 100644
index 000000000..00a18ea39
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-bind.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-connect.json b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-connect.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-connect.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-connect.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-connect.wasm
new file mode 100644
index 000000000..475f3b697
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-connect.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-listen.json b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-listen.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-listen.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-listen.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-listen.wasm
new file mode 100644
index 000000000..93887f6a6
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-listen.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-properties.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-properties.wasm
new file mode 100644
index 000000000..41b791e15
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-properties.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-receive.json b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-receive.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-receive.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-receive.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-receive.wasm
new file mode 100644
index 000000000..efcffefe7
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-receive.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-send.json b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-send.json
new file mode 100644
index 000000000..911b8c363
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-send.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-send.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-send.wasm
new file mode 100644
index 000000000..d558e7746
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-tcp-send.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-bind.json b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-bind.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-bind.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-bind.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-bind.wasm
new file mode 100644
index 000000000..898d346f6
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-bind.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-connect.json b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-connect.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-connect.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-connect.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-connect.wasm
new file mode 100644
index 000000000..e5cc999bf
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-connect.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-properties.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-properties.wasm
new file mode 100644
index 000000000..8940962d3
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-properties.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-receive.json b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-receive.json
new file mode 100644
index 000000000..79aba77cc
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-receive.json
@@ -0,0 +1,13 @@
+{
+  "proposals": [
+    "sockets"
+  ],
+  "operations": [
+    {
+      "type": "run"
+    },
+    {
+      "type": "wait"
+    }
+  ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-receive.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-receive.wasm
new file mode 100644
index 000000000..c11519795
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-receive.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-send.json b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-send.json
new file mode 100644
index 000000000..0cbd0e970
--- /dev/null
+++ b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-send.json
@@ -0,0 +1,11 @@
+{
+    "proposals": ["sockets"],
+    "operations": [
+	{
+	    "type": "run"
+	},
+	{
+	    "type": "wait"
+	}
+    ]
+}
diff --git a/tests/rust/testsuite/wasm32-wasip3/sockets-udp-send.wasm b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-send.wasm
new file mode 100644
index 000000000..65d40fd75
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/sockets-udp-send.wasm differ
diff --git a/tests/rust/testsuite/wasm32-wasip3/wall-clock.wasm b/tests/rust/testsuite/wasm32-wasip3/wall-clock.wasm
new file mode 100644
index 000000000..d0320ece7
Binary files /dev/null and b/tests/rust/testsuite/wasm32-wasip3/wall-clock.wasm differ