diff --git a/docker/test/entrypoint.sh b/docker/test/entrypoint.sh
index 6589b22..25cdb7d 100755
--- a/docker/test/entrypoint.sh
+++ b/docker/test/entrypoint.sh
@@ -556,10 +556,17 @@ EOF
     *-wasi*)
         [[ -f "${toolchain_dir}/bin/wasmtime" ]] || cp "$(type -P "wasmtime")" "${toolchain_dir}/bin"
         runner="${RUST_TARGET}-runner"
+        wasi_options=''
+        case "${RUST_TARGET}" in
+            *-threads) wasi_options+=' -S threads=y'
+        esac
+        case "${RUST_TARGET}" in
+            *-wasip2*) wasi_options+=' -S preview2=y'
+        esac
         cat >"${toolchain_dir}/bin/${runner}" <<EOF
 #!/bin/sh
 set -eu
-exec wasmtime run -W all-proposals "\$@"
+exec wasmtime run -W all-proposals${wasi_options} "\$@"
 EOF
         chmod +x "${toolchain_dir}/bin/${runner}"
         cat "${toolchain_dir}/bin/${runner}"
diff --git a/docker/test/test.sh b/docker/test/test.sh
index 81fdb0d..3129c65 100755
--- a/docker/test/test.sh
+++ b/docker/test/test.sh
@@ -235,7 +235,7 @@ case "${RUST_TARGET}" in
     # TODO(aarch64-unknown-openbsd): clang segfault
     # TODO(sparc64-unknown-openbsd): error: undefined symbol: main
     # TODO(*-wasip1-threads): not output
-    arm*-android* | thumb*-android* | i686-*-android* | aarch64-unknown-openbsd | sparc64-unknown-openbsd| *-wasip1-threads) no_cpp=1 ;;
+    arm*-android* | thumb*-android* | i686-*-android* | aarch64-unknown-openbsd | sparc64-unknown-openbsd | *-wasip1-threads) no_cpp=1 ;;
     # TODO(redox): /x86_64-unknown-redox/x86_64-unknown-redox/include/bits/wchar.h:12:28: error: cannot combine with previous 'int' declaration specifier
     *-redox*)
         case "${cc}" in
diff --git a/tools/target-list-shared.sh b/tools/target-list-shared.sh
index c9545f3..ccf0120 100644
--- a/tools/target-list-shared.sh
+++ b/tools/target-list-shared.sh
@@ -210,8 +210,8 @@ windows_gnu_targets=(
 )
 # WASI
 wasi_targets=(
-    wasm32-wasi
-    wasm32-wasip1
+    # wasm32-wasi
+    # wasm32-wasip1
     wasm32-wasip1-threads
     wasm32-wasip2 # tier3
 )