diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcfbd3eab48..43b03b76e89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## **[Unreleased]**
 
 - [#1301](https://github.com/wasmerio/wasmer/pull/1301) Update supported stable Rust version to 1.41.1.
+- [#1300](https://github.com/wasmerio/wasmer/pull/1300) Add support for multiple versions of WASI tests: wasitests now test all versions of WASI.
 - [#1285](https://github.com/wasmerio/wasmer/pull/1285) Greatly improve errors in `wasmer-interface-types`
 - [#1283](https://github.com/wasmerio/wasmer/pull/1283) Workaround for floating point arguments and return values in `DynamicFunc`s.
 
diff --git a/Cargo.lock b/Cargo.lock
index 3cd09fa0d47..53adf7572d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2133,6 +2133,7 @@ name = "wasmer-wasi-tests"
 version = "0.16.2"
 dependencies = [
  "glob 0.3.0",
+ "tempfile",
  "wasmer-clif-backend",
  "wasmer-dev-utils",
  "wasmer-llvm-backend",
diff --git a/Makefile b/Makefile
index 7365279abe5..6c0441c0012 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: spectests emtests clean build install lint precommit docs examples
+.PHONY: spectests emtests clean build install lint precommit docs examples 
 
 # Generate files
 generate-spectests:
@@ -11,15 +11,31 @@ generate-emtests:
 	&& echo "formatting" \
 	&& cargo fmt
 
+# To generate WASI tests you'll need to have the correct versions of the Rust nightly
+# toolchain installed, see `WasiVersion::get_compiler_toolchain` in
+# `lib/wasi-tests/build/wasi_version.rs`
+#
+# or run `make wasitests-setup-toolchain` or `make wasitests-setup-toolchain-all`
 generate-wasitests: wasitests-setup
 	WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi-tests --release -vv \
 	&& echo "formatting" \
 	&& cargo fmt
 
+generate-wasitests-all: wasitests-setup
+	WASI_TEST_GENERATE_ALL=1 WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi-tests --release -vv \
+	&& echo "formatting" \
+	&& cargo fmt
+
 spectests-generate: generate-spectests
 emtests-generate: generate-emtests
 wasitests-generate: generate-wasitests
 
+wasitests-setup-toolchain: wasitests-setup
+	WASITESTS_SET_UP_TOOLCHAIN=1 cargo build -p wasmer-wasi-tests --release -vv
+
+wasitests-setup-toolchain-all: wasitests-setup
+	WASI_TEST_GENERATE_ALL=1 WASITESTS_SET_UP_TOOLCHAIN=1 cargo build -p wasmer-wasi-tests --release -vv
+
 generate: generate-spectests generate-emtests generate-wasitests
 
 
@@ -67,6 +83,8 @@ middleware: middleware-singlepass middleware-cranelift middleware-llvm
 
 # Wasitests
 wasitests-setup:
+# force cargo to rerun the build.rs step
+	touch lib/wasi-tests/build/mod.rs
 	rm -rf lib/wasi-tests/wasitests/test_fs/temp
 	mkdir -p lib/wasi-tests/wasitests/test_fs/temp
 
diff --git a/lib/wasi-tests/Cargo.toml b/lib/wasi-tests/Cargo.toml
index 3a542ab7a71..402fd599451 100644
--- a/lib/wasi-tests/Cargo.toml
+++ b/lib/wasi-tests/Cargo.toml
@@ -19,6 +19,7 @@ wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features =
 
 [build-dependencies]
 glob = "0.3"
+tempfile = "3"
 
 [dev-dependencies]
 wasmer-dev-utils = { path = "../dev-utils", version = "0.16.2"}
diff --git a/lib/wasi-tests/build/mod.rs b/lib/wasi-tests/build/mod.rs
index 778ae9ea593..d7ad095fba9 100644
--- a/lib/wasi-tests/build/mod.rs
+++ b/lib/wasi-tests/build/mod.rs
@@ -1,11 +1,20 @@
 use std::env;
 
+mod set_up_toolchain;
+mod util;
+mod wasi_version;
 mod wasitests;
 
 static WASITESTS_ENV_VAR: &str = "WASM_WASI_GENERATE_WASITESTS";
+static WASITESTS_SET_UP_TOOLCHAIN: &str = "WASM_WASI_SET_UP_TOOLCHAIN";
 
 fn main() {
+    let do_all_wasi_tests = util::should_operate_on_all_wasi_tests();
+    if env::var(WASITESTS_SET_UP_TOOLCHAIN).unwrap_or("0".to_string()) == "1" {
+        set_up_toolchain::set_it_up(do_all_wasi_tests);
+    }
+
     if env::var(WASITESTS_ENV_VAR).unwrap_or("0".to_string()) == "1" {
-        wasitests::build();
+        wasitests::build(do_all_wasi_tests);
     }
 }
diff --git a/lib/wasi-tests/build/set_up_toolchain.rs b/lib/wasi-tests/build/set_up_toolchain.rs
new file mode 100644
index 00000000000..6add53c70dd
--- /dev/null
+++ b/lib/wasi-tests/build/set_up_toolchain.rs
@@ -0,0 +1,31 @@
+use crate::util;
+use crate::wasi_version::*;
+
+use std::process::Command;
+
+fn install_toolchain(toolchain_name: &str) {
+    println!("Installing rustup toolchain: {}", toolchain_name);
+    let rustup_out = Command::new("rustup")
+        .arg("toolchain")
+        .arg("install")
+        .arg(toolchain_name)
+        .output()
+        .expect("Failed to install toolchain with rustup");
+    util::print_info_on_error(&rustup_out, "TOOLCHAIN INSTALL FAILED");
+}
+
+pub fn set_it_up(only_latest: bool) {
+    println!("Setting up system to generate the WASI tests.");
+    println!("WARNING: this may use a lot of disk space.");
+
+    let wasi_versions = if only_latest {
+        println!("Only installing the toolchain for the latest WASI version");
+        LATEST_WASI_VERSION
+    } else {
+        println!("Installing the toolchain for all WASI versions");
+        ALL_WASI_VERSIONS
+    };
+    for wasi_version in wasi_versions {
+        install_toolchain(wasi_version.get_compiler_toolchain());
+    }
+}
diff --git a/lib/wasi-tests/build/util.rs b/lib/wasi-tests/build/util.rs
new file mode 100644
index 00000000000..b2d9ad14b04
--- /dev/null
+++ b/lib/wasi-tests/build/util.rs
@@ -0,0 +1,22 @@
+pub fn print_info_on_error(output: &std::process::Output, context: &str) {
+    if !output.status.success() {
+        println!("{}", context);
+        println!(
+            "stdout:\n{}",
+            std::str::from_utf8(&output.stdout[..]).unwrap()
+        );
+        eprintln!(
+            "stderr:\n{}",
+            std::str::from_utf8(&output.stderr[..]).unwrap()
+        );
+    }
+}
+
+/// Whether or not we should operate on all WASI tests or not
+pub fn should_operate_on_all_wasi_tests() -> bool {
+    std::env::var("WASI_TEST_GENERATE_ALL")
+        .ok()
+        .and_then(|s| s.parse::<u32>().ok())
+        .unwrap_or(0)
+        == 1
+}
diff --git a/lib/wasi-tests/build/wasi_version.rs b/lib/wasi-tests/build/wasi_version.rs
new file mode 100644
index 00000000000..10abf6785e8
--- /dev/null
+++ b/lib/wasi-tests/build/wasi_version.rs
@@ -0,0 +1,29 @@
+pub static ALL_WASI_VERSIONS: &[WasiVersion] = &[WasiVersion::Unstable, WasiVersion::Snapshot1];
+pub static LATEST_WASI_VERSION: &[WasiVersion] = &[WasiVersion::get_latest()];
+
+#[derive(Debug, Clone, Copy)]
+pub enum WasiVersion {
+    /// A.K.A. Snapshot0
+    Unstable,
+    Snapshot1,
+}
+
+impl WasiVersion {
+    pub const fn get_latest() -> Self {
+        Self::Snapshot1
+    }
+
+    pub fn get_compiler_toolchain(&self) -> &'static str {
+        match self {
+            WasiVersion::Unstable => "nightly-2019-09-13",
+            WasiVersion::Snapshot1 => "nightly-2019-12-18",
+        }
+    }
+
+    pub fn get_directory_name(&self) -> &'static str {
+        match self {
+            WasiVersion::Unstable => "unstable",
+            WasiVersion::Snapshot1 => "snapshot1",
+        }
+    }
+}
diff --git a/lib/wasi-tests/build/wasitests.rs b/lib/wasi-tests/build/wasitests.rs
index 5ccda63c9fe..c4d3ecb03cd 100644
--- a/lib/wasi-tests/build/wasitests.rs
+++ b/lib/wasi-tests/build/wasitests.rs
@@ -8,111 +8,160 @@
 use glob::glob;
 use std::collections::HashSet;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use std::fs::File;
 use std::io::prelude::*;
-use std::io::BufReader;
+use std::io::{self, BufReader};
+
+use crate::util;
+use crate::wasi_version::*;
 
 static BANNER: &str = "// !!! THIS IS A GENERATED FILE !!!
 // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
 // Files autogenerated with cargo build (build/wasitests.rs).\n";
 
-pub fn compile(file: &str, ignores: &HashSet<String>) -> Option<String> {
-    let mut output_path = PathBuf::from(file);
-    output_path.set_extension("out");
-
-    assert!(file.ends_with(".rs"));
-    let normalized_name = {
-        let mut nn = file.to_lowercase();
-        nn.truncate(file.len() - 3);
-        nn
-    };
-
-    println!("Compiling program {} to native", file);
+/// Compile and execute the test file as native code, saving the results to be
+/// compared against later.
+///
+/// This function attempts to clean up its output after it executes it.
+fn generate_native_output(temp_dir: &Path, file: &str, normalized_name: &str) -> io::Result<()> {
+    let executable_path = temp_dir.join(normalized_name);
+    println!(
+        "Compiling program {} to native at {}",
+        file,
+        executable_path.to_string_lossy()
+    );
     let native_out = Command::new("rustc")
         .arg(file)
         .arg("-o")
-        .arg(&normalized_name)
+        .arg(&executable_path)
         .output()
         .expect("Failed to compile program to native code");
-    print_info_on_error(&native_out, "COMPILATION FAILED");
+    util::print_info_on_error(&native_out, "COMPILATION FAILED");
 
     #[cfg(unix)]
     {
         use std::os::unix::fs::PermissionsExt;
-        let normal_path = PathBuf::from(&normalized_name);
-        let mut perm = normal_path
+        let mut perm = executable_path
             .metadata()
             .expect("native executable")
             .permissions();
         perm.set_mode(0o766);
-        fs::set_permissions(normal_path, perm).expect("set permissions");
+        println!(
+            "Setting execute permissions on {}",
+            executable_path.to_string_lossy()
+        );
+        fs::set_permissions(&executable_path, perm)?;
     }
-    let rs_module_name = {
-        let temp = PathBuf::from(&normalized_name);
-        temp.file_name().unwrap().to_string_lossy().to_string()
-    };
 
-    let result = Command::new(&normalized_name)
+    let result = Command::new(&executable_path)
         .output()
         .expect("Failed to execute native program");
-    print_info_on_error(&result, "NATIVE PROGRAM FAILED");
+    util::print_info_on_error(&result, "NATIVE PROGRAM FAILED");
 
-    std::fs::remove_file(&normalized_name).expect("could not delete executable");
-    let wasm_out_name = format!("{}.wasm", &normalized_name);
+    let mut output_path = executable_path.clone();
+    output_path.set_extension("out");
 
-    let mut file_contents = String::new();
-    {
-        let mut file = std::fs::File::open(file).unwrap();
-        file.read_to_string(&mut file_contents).unwrap();
+    println!("Writing output to {}", output_path.to_string_lossy());
+    fs::write(&output_path, result.stdout)?;
+    Ok(())
+}
+
+/// compile the Wasm file for the given version of WASI
+///
+/// returns the path of where the wasm file is
+fn compile_wasm_for_version(
+    temp_dir: &Path,
+    file: &str,
+    base_dir: &Path,
+    rs_mod_name: &str,
+    version: WasiVersion,
+) -> io::Result<PathBuf> {
+    let out_dir = base_dir.join(version.get_directory_name());
+    if !out_dir.exists() {
+        fs::create_dir(&out_dir)?;
     }
+    let wasm_out_name = {
+        let mut wasm_out_name = out_dir.join(rs_mod_name);
+        wasm_out_name.set_extension("wasm");
+        wasm_out_name
+    };
+    println!("Reading contents from file `{}`", file);
+    let file_contents: String = {
+        let mut fc = String::new();
+        let mut f = fs::OpenOptions::new().read(true).open(&file)?;
+        f.read_to_string(&mut fc)?;
+        fc
+    };
+
+    let temp_wasi_rs_file_name = temp_dir.join(format!("wasi_modified_version_{}.rs", rs_mod_name));
     {
-        let mut actual_file = std::fs::OpenOptions::new()
+        let mut actual_file = fs::OpenOptions::new()
             .write(true)
             .truncate(true)
-            .open(file)
-            .unwrap();
-        actual_file
-            .write_all(format!("#![feature(wasi_ext)]\n{}", &file_contents).as_bytes())
+            .create(true)
+            .open(&temp_wasi_rs_file_name)
             .unwrap();
+        actual_file.write_all(b"#![feature(wasi_ext)]\n").unwrap();
+        actual_file.write_all(file_contents.as_bytes()).unwrap();
     }
 
+    println!(
+        "Compiling wasm module `{}` with toolchain `{}`",
+        &wasm_out_name.to_string_lossy(),
+        version.get_compiler_toolchain()
+    );
     let wasm_compilation_out = Command::new("rustc")
-        .arg("+nightly")
+        .arg(format!("+{}", version.get_compiler_toolchain()))
         .arg("--target=wasm32-wasi")
         .arg("-C")
         .arg("opt-level=z")
-        .arg(file)
+        .arg(&temp_wasi_rs_file_name)
         .arg("-o")
         .arg(&wasm_out_name)
         .output()
-        .expect("Failed to compile program to native code");
-    print_info_on_error(&wasm_compilation_out, "WASM COMPILATION");
-    {
-        let mut actual_file = std::fs::OpenOptions::new()
-            .write(true)
-            .truncate(true)
-            .open(file)
-            .unwrap();
-        actual_file.write_all(file_contents.as_bytes()).unwrap();
-    }
+        .expect("Failed to compile program to wasm");
+    util::print_info_on_error(&wasm_compilation_out, "WASM COMPILATION");
+    println!(
+        "Removing file `{}`",
+        &temp_wasi_rs_file_name.to_string_lossy()
+    );
 
     // to prevent commiting huge binary blobs forever
     let wasm_strip_out = Command::new("wasm-strip")
         .arg(&wasm_out_name)
         .output()
         .expect("Failed to strip compiled wasm module");
-    print_info_on_error(&wasm_strip_out, "STRIPPING WASM");
+    util::print_info_on_error(&wasm_strip_out, "STRIPPING WASM");
+    let wasm_opt_out = Command::new("wasm-opt")
+        .arg("-Oz")
+        .arg(&wasm_out_name)
+        .arg("-o")
+        .arg(&wasm_out_name)
+        .output()
+        .expect("Failed to optimize compiled wasm module with wasm-opt!");
+    util::print_info_on_error(&wasm_opt_out, "OPTIMIZING WASM");
+
+    Ok(wasm_out_name)
+}
 
-    let ignored = if ignores.contains(&rs_module_name) {
+fn generate_test_file(
+    file: &str,
+    rs_module_name: &str,
+    wasm_out_name: &str,
+    version: WasiVersion,
+    ignores: &HashSet<String>,
+) -> io::Result<String> {
+    let test_name = format!("{}_{}", version.get_directory_name(), rs_module_name);
+    let ignored = if ignores.contains(&test_name) || ignores.contains(rs_module_name) {
         "\n#[ignore]"
     } else {
         ""
     };
 
-    let src_code = fs::read_to_string(file).expect("read src file");
+    let src_code = fs::read_to_string(file)?;
     let args: Args = extract_args_from_source_file(&src_code).unwrap_or_default();
 
     let mapdir_args = {
@@ -156,10 +205,10 @@ pub fn compile(file: &str, ignores: &HashSet<String>) -> Option<String> {
         "{banner}
 
 #[test]{ignore}
-fn test_{rs_module_name}() {{
+fn test_{test_name}() {{
     assert_wasi_output!(
         \"../../{module_path}\",
-        \"{rs_module_name}\",
+        \"{test_name}\",
         {dir_args},
         {mapdir_args},
         {envvar_args},
@@ -170,39 +219,89 @@ fn test_{rs_module_name}() {{
         banner = BANNER,
         ignore = ignored,
         module_path = wasm_out_name,
-        rs_module_name = rs_module_name,
-        test_output_path = format!("{}.out", normalized_name),
+        test_name = &test_name,
+        test_output_path = format!("wasitests/{}.out", rs_module_name),
         dir_args = dir_args,
         mapdir_args = mapdir_args,
         envvar_args = envvar_args
     );
     let rust_test_filepath = format!(
-        concat!(env!("CARGO_MANIFEST_DIR"), "/tests/{}.rs"),
-        normalized_name,
+        concat!(env!("CARGO_MANIFEST_DIR"), "/tests/wasitests/{}.rs"),
+        &test_name,
     );
-    fs::write(&rust_test_filepath, contents.as_bytes()).expect("writing test file");
-    fs::write(&output_path, result.stdout).expect("writing output to file");
+    fs::write(&rust_test_filepath, contents.as_bytes())?;
+
+    Ok(test_name)
+}
+
+/// Returns the a Vec of the test modules created
+fn compile(
+    temp_dir: &Path,
+    file: &str,
+    ignores: &HashSet<String>,
+    wasi_versions: &[WasiVersion],
+) -> Vec<String> {
+    // TODO: hook up compile_wasm_for_version, etc with new args
+    assert!(file.ends_with(".rs"));
+    let rs_mod_name = {
+        Path::new(&file.to_lowercase())
+            .file_stem()
+            .unwrap()
+            .to_string_lossy()
+            .to_string()
+    };
+    let base_dir = Path::new(file).parent().unwrap();
+    generate_native_output(temp_dir, &file, &rs_mod_name).expect("Generate native output");
+    let mut out = vec![];
+
+    for &version in wasi_versions {
+        let wasm_out_path = compile_wasm_for_version(temp_dir, file, base_dir, &rs_mod_name, version)
+            .expect(&format!("Could not compile Wasm to WASI version {:?}, perhaps you need to install the `{}` rust toolchain", version, version.get_compiler_toolchain()));
+        let wasm_out_name = wasm_out_path.to_string_lossy();
+        let test_mod = generate_test_file(file, &rs_mod_name, &wasm_out_name, version, ignores)
+            .expect(&format!("generate test file {}", &rs_mod_name));
+        out.push(test_mod);
+    }
+
+    out
+}
+
+fn run_prelude(should_gen_all: bool) -> &'static [WasiVersion] {
+    if should_gen_all {
+        println!(
+            "Generating WASI tests for all versions of WASI. Run with WASI_TEST_GENERATE_ALL=0 to only generate the latest tests."
+        );
+    } else {
+        println!(
+            "Generating WASI tests for the latest version of WASI. Run with WASI_TEST_GENERATE_ALL=1 to generate all versions of the tests."
+        );
+    }
 
-    Some(rs_module_name)
+    if should_gen_all {
+        ALL_WASI_VERSIONS
+    } else {
+        LATEST_WASI_VERSION
+    }
 }
 
-pub fn build() {
+pub fn build(should_gen_all: bool) {
     let rust_test_modpath = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/wasitests/mod.rs");
 
     let mut modules: Vec<String> = Vec::new();
+    let wasi_versions = run_prelude(should_gen_all);
 
+    let temp_dir = tempfile::TempDir::new().unwrap();
     let ignores = read_ignore_list();
     for entry in glob("wasitests/*.rs").unwrap() {
         match entry {
             Ok(path) => {
                 let test = path.to_str().unwrap();
-                if let Some(module_name) = compile(test, &ignores) {
-                    modules.push(module_name);
-                }
+                modules.extend(compile(temp_dir.path(), test, &ignores, wasi_versions));
             }
             Err(e) => println!("{:?}", e),
         }
     }
+    println!("All modules generated. Generating test harness.");
     modules.sort();
     let mut modules: Vec<String> = modules.iter().map(|m| format!("mod {};", m)).collect();
     assert!(modules.len() > 0, "Expected > 0 modules found");
@@ -213,10 +312,24 @@ pub fn build() {
     modules.push("".to_string());
 
     let modfile: String = modules.join("\n");
-    let source = fs::read(&rust_test_modpath).unwrap();
-    // We only modify the mod file if has changed
-    if source != modfile.as_bytes() {
-        fs::write(&rust_test_modpath, modfile.as_bytes()).unwrap();
+    let should_regen: bool = {
+        if let Ok(mut f) = fs::File::open(&rust_test_modpath) {
+            let mut s = String::new();
+            f.read_to_string(&mut s).unwrap();
+            s != modfile
+        } else {
+            false
+        }
+    };
+    if should_regen {
+        println!("Writing to `{}`", &rust_test_modpath);
+        let mut test_harness_file = fs::OpenOptions::new()
+            .write(true)
+            .create(true)
+            .truncate(true)
+            .open(&rust_test_modpath)
+            .unwrap();
+        test_harness_file.write_all(modfile.as_bytes()).unwrap();
     }
 }
 
@@ -292,17 +405,3 @@ fn extract_args_from_source_file(source_code: &str) -> Option<Args> {
     }
     None
 }
-
-fn print_info_on_error(output: &std::process::Output, context: &str) {
-    if !output.status.success() {
-        println!("{}", context);
-        println!(
-            "stdout:\n{}",
-            std::str::from_utf8(&output.stdout[..]).unwrap()
-        );
-        eprintln!(
-            "stderr:\n{}",
-            std::str::from_utf8(&output.stderr[..]).unwrap()
-        );
-    }
-}
diff --git a/lib/wasi-tests/src/lib.rs b/lib/wasi-tests/src/lib.rs
index 6bf3626dd71..b65021aeb04 100644
--- a/lib/wasi-tests/src/lib.rs
+++ b/lib/wasi-tests/src/lib.rs
@@ -15,7 +15,7 @@ fn serializing_works() {
         b"PATH=/bin".into_iter().cloned().collect(),
         b"GOROOT=$HOME/.cargo/bin".into_iter().cloned().collect(),
     ];
-    let wasm_binary = include_bytes!("../wasitests/fd_read.wasm");
+    let wasm_binary = include_bytes!("../wasitests/unstable/fd_read.wasm");
     let module = compile(&wasm_binary[..])
         .map_err(|e| format!("Can't compile module: {:?}", e))
         .unwrap();
diff --git a/lib/wasi-tests/tests/wasitests/mod.rs b/lib/wasi-tests/tests/wasitests/mod.rs
index 59092573ab2..8a3c6b27d40 100644
--- a/lib/wasi-tests/tests/wasitests/mod.rs
+++ b/lib/wasi-tests/tests/wasitests/mod.rs
@@ -5,26 +5,49 @@
 // The _common module is not autogenerated.  It provides common macros for the wasitests
 #[macro_use]
 mod _common;
-mod close_preopen_fd;
-mod create_dir;
-mod envvar;
-mod fd_allocate;
-mod fd_append;
-mod fd_close;
-mod fd_pread;
-mod fd_read;
-mod fd_sync;
-mod file_metadata;
-mod fs_sandbox_test;
-mod fseek;
-mod hello;
-mod isatty;
-mod mapdir;
-mod path_link;
-mod path_rename;
-mod path_symlink;
-mod poll_oneoff;
-mod quine;
-mod readlink;
-mod wasi_sees_virtual_root;
-mod writing;
+mod snapshot1_close_preopen_fd;
+mod snapshot1_create_dir;
+mod snapshot1_envvar;
+mod snapshot1_fd_allocate;
+mod snapshot1_fd_append;
+mod snapshot1_fd_close;
+mod snapshot1_fd_pread;
+mod snapshot1_fd_read;
+mod snapshot1_fd_sync;
+mod snapshot1_file_metadata;
+mod snapshot1_fs_sandbox_test;
+mod snapshot1_fseek;
+mod snapshot1_hello;
+mod snapshot1_isatty;
+mod snapshot1_mapdir;
+mod snapshot1_path_link;
+mod snapshot1_path_rename;
+mod snapshot1_path_symlink;
+mod snapshot1_poll_oneoff;
+mod snapshot1_quine;
+mod snapshot1_readlink;
+mod snapshot1_wasi_sees_virtual_root;
+mod snapshot1_writing;
+mod unstable_close_preopen_fd;
+mod unstable_create_dir;
+mod unstable_envvar;
+mod unstable_fd_allocate;
+mod unstable_fd_append;
+mod unstable_fd_close;
+mod unstable_fd_pread;
+mod unstable_fd_read;
+mod unstable_fd_sync;
+mod unstable_file_metadata;
+mod unstable_fs_sandbox_test;
+mod unstable_fseek;
+mod unstable_hello;
+mod unstable_isatty;
+mod unstable_mapdir;
+mod unstable_path_link;
+mod unstable_path_rename;
+mod unstable_path_symlink;
+mod unstable_poll_oneoff;
+mod unstable_quine;
+mod unstable_readlink;
+mod unstable_wasi_sees_virtual_root;
+mod unstable_writing;
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_close_preopen_fd.rs b/lib/wasi-tests/tests/wasitests/snapshot1_close_preopen_fd.rs
new file mode 100644
index 00000000000..e887861c857
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_close_preopen_fd.rs
@@ -0,0 +1,19 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+#[ignore]
+fn test_snapshot1_close_preopen_fd() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/close_preopen_fd.wasm",
+        "snapshot1_close_preopen_fd",
+        vec![],
+        vec![(
+            "hamlet".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/close_preopen_fd.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_create_dir.rs b/lib/wasi-tests/tests/wasitests/snapshot1_create_dir.rs
new file mode 100644
index 00000000000..629f7a220e3
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_create_dir.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_create_dir() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/create_dir.wasm",
+        "snapshot1_create_dir",
+        vec![std::path::PathBuf::from("."),],
+        vec![],
+        vec![],
+        "../../wasitests/create_dir.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_envvar.rs b/lib/wasi-tests/tests/wasitests/snapshot1_envvar.rs
new file mode 100644
index 00000000000..dbac0d47106
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_envvar.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_envvar() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/envvar.wasm",
+        "snapshot1_envvar",
+        vec![],
+        vec![],
+        vec!["DOG=1".to_string(), "CAT=2".to_string(),],
+        "../../wasitests/envvar.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_allocate.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_allocate.rs
new file mode 100644
index 00000000000..a3f1caf9daf
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fd_allocate.rs
@@ -0,0 +1,19 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+#[ignore]
+fn test_snapshot1_fd_allocate() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fd_allocate.wasm",
+        "snapshot1_fd_allocate",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/temp")
+        ),],
+        vec![],
+        "../../wasitests/fd_allocate.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_append.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_append.rs
new file mode 100644
index 00000000000..a160be58d59
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fd_append.rs
@@ -0,0 +1,18 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_fd_append() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fd_append.wasm",
+        "snapshot1_fd_append",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/temp")
+        ),],
+        vec![],
+        "../../wasitests/fd_append.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_close.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_close.rs
new file mode 100644
index 00000000000..ab56e38742d
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fd_close.rs
@@ -0,0 +1,19 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+#[ignore]
+fn test_snapshot1_fd_close() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fd_close.wasm",
+        "snapshot1_fd_close",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/fd_close.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_pread.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_pread.rs
new file mode 100644
index 00000000000..77ea8123e70
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fd_pread.rs
@@ -0,0 +1,19 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+#[ignore]
+fn test_snapshot1_fd_pread() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fd_pread.wasm",
+        "snapshot1_fd_pread",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/fd_pread.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_read.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_read.rs
new file mode 100644
index 00000000000..58f63824942
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fd_read.rs
@@ -0,0 +1,19 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+#[ignore]
+fn test_snapshot1_fd_read() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fd_read.wasm",
+        "snapshot1_fd_read",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/fd_read.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_sync.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_sync.rs
new file mode 100644
index 00000000000..fcbb252a2b1
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fd_sync.rs
@@ -0,0 +1,18 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_fd_sync() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fd_sync.wasm",
+        "snapshot1_fd_sync",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/temp")
+        ),],
+        vec![],
+        "../../wasitests/fd_sync.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_file_metadata.rs b/lib/wasi-tests/tests/wasitests/snapshot1_file_metadata.rs
new file mode 100644
index 00000000000..b26b5cc44d0
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_file_metadata.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_file_metadata() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/file_metadata.wasm",
+        "snapshot1_file_metadata",
+        vec![std::path::PathBuf::from("."),],
+        vec![],
+        vec![],
+        "../../wasitests/file_metadata.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fs_sandbox_test.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fs_sandbox_test.rs
new file mode 100644
index 00000000000..c95842a1fd4
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fs_sandbox_test.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_fs_sandbox_test() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fs_sandbox_test.wasm",
+        "snapshot1_fs_sandbox_test",
+        vec![],
+        vec![],
+        vec![],
+        "../../wasitests/fs_sandbox_test.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fseek.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fseek.rs
new file mode 100644
index 00000000000..8e1cbac625c
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_fseek.rs
@@ -0,0 +1,18 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_fseek() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/fseek.wasm",
+        "snapshot1_fseek",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/fseek.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_hello.rs b/lib/wasi-tests/tests/wasitests/snapshot1_hello.rs
new file mode 100644
index 00000000000..af895a2c765
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_hello.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_hello() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/hello.wasm",
+        "snapshot1_hello",
+        vec![],
+        vec![],
+        vec![],
+        "../../wasitests/hello.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_isatty.rs b/lib/wasi-tests/tests/wasitests/snapshot1_isatty.rs
new file mode 100644
index 00000000000..17cdf11aee9
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_isatty.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_isatty() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/isatty.wasm",
+        "snapshot1_isatty",
+        vec![],
+        vec![],
+        vec![],
+        "../../wasitests/isatty.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_mapdir.rs b/lib/wasi-tests/tests/wasitests/snapshot1_mapdir.rs
new file mode 100644
index 00000000000..32cfae71622
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_mapdir.rs
@@ -0,0 +1,18 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_mapdir() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/mapdir.wasm",
+        "snapshot1_mapdir",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/mapdir.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_path_link.rs b/lib/wasi-tests/tests/wasitests/snapshot1_path_link.rs
new file mode 100644
index 00000000000..ee99737b6f1
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_path_link.rs
@@ -0,0 +1,24 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_path_link() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/path_link.wasm",
+        "snapshot1_path_link",
+        vec![],
+        vec![
+            (
+                "act5".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act5")
+            ),
+            (
+                "temp".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/temp")
+            ),
+        ],
+        vec![],
+        "../../wasitests/path_link.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_path_rename.rs b/lib/wasi-tests/tests/wasitests/snapshot1_path_rename.rs
new file mode 100644
index 00000000000..577165f49ca
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_path_rename.rs
@@ -0,0 +1,18 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_path_rename() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/path_rename.wasm",
+        "snapshot1_path_rename",
+        vec![],
+        vec![(
+            "temp".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/temp")
+        ),],
+        vec![],
+        "../../wasitests/path_rename.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_path_symlink.rs b/lib/wasi-tests/tests/wasitests/snapshot1_path_symlink.rs
new file mode 100644
index 00000000000..923619ba34b
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_path_symlink.rs
@@ -0,0 +1,24 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_path_symlink() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/path_symlink.wasm",
+        "snapshot1_path_symlink",
+        vec![],
+        vec![
+            (
+                "temp".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/temp")
+            ),
+            (
+                "hamlet".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+            ),
+        ],
+        vec![],
+        "../../wasitests/path_symlink.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_poll_oneoff.rs b/lib/wasi-tests/tests/wasitests/snapshot1_poll_oneoff.rs
new file mode 100644
index 00000000000..bc689194f88
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_poll_oneoff.rs
@@ -0,0 +1,25 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+#[ignore]
+fn test_snapshot1_poll_oneoff() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/poll_oneoff.wasm",
+        "snapshot1_poll_oneoff",
+        vec![],
+        vec![
+            (
+                "hamlet".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+            ),
+            (
+                "temp".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/temp")
+            ),
+        ],
+        vec![],
+        "../../wasitests/poll_oneoff.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_quine.rs b/lib/wasi-tests/tests/wasitests/snapshot1_quine.rs
new file mode 100644
index 00000000000..71366923e4a
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_quine.rs
@@ -0,0 +1,15 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_quine() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/quine.wasm",
+        "snapshot1_quine",
+        vec![std::path::PathBuf::from("."),],
+        vec![],
+        vec![],
+        "../../wasitests/quine.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_readlink.rs b/lib/wasi-tests/tests/wasitests/snapshot1_readlink.rs
new file mode 100644
index 00000000000..2b6c675b920
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_readlink.rs
@@ -0,0 +1,18 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_readlink() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/readlink.wasm",
+        "snapshot1_readlink",
+        vec![],
+        vec![(
+            ".".to_string(),
+            ::std::path::PathBuf::from("wasitests/test_fs/hamlet")
+        ),],
+        vec![],
+        "../../wasitests/readlink.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs b/lib/wasi-tests/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs
new file mode 100644
index 00000000000..626df39f93c
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs
@@ -0,0 +1,28 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_wasi_sees_virtual_root() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/wasi_sees_virtual_root.wasm",
+        "snapshot1_wasi_sees_virtual_root",
+        vec![],
+        vec![
+            (
+                "act1".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1")
+            ),
+            (
+                "act2".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act2")
+            ),
+            (
+                "act1-again".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1")
+            ),
+        ],
+        vec![],
+        "../../wasitests/wasi_sees_virtual_root.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_writing.rs b/lib/wasi-tests/tests/wasitests/snapshot1_writing.rs
new file mode 100644
index 00000000000..d48cc32edcc
--- /dev/null
+++ b/lib/wasi-tests/tests/wasitests/snapshot1_writing.rs
@@ -0,0 +1,28 @@
+// !!! THIS IS A GENERATED FILE !!!
+// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME
+// Files autogenerated with cargo build (build/wasitests.rs).
+
+#[test]
+fn test_snapshot1_writing() {
+    assert_wasi_output!(
+        "../../wasitests/snapshot1/writing.wasm",
+        "snapshot1_writing",
+        vec![],
+        vec![
+            (
+                "act1".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1")
+            ),
+            (
+                "act2".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act2")
+            ),
+            (
+                "act1-again".to_string(),
+                ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1")
+            ),
+        ],
+        vec![],
+        "../../wasitests/writing.out"
+    );
+}
diff --git a/lib/wasi-tests/tests/wasitests/close_preopen_fd.rs b/lib/wasi-tests/tests/wasitests/unstable_close_preopen_fd.rs
similarity index 75%
rename from lib/wasi-tests/tests/wasitests/close_preopen_fd.rs
rename to lib/wasi-tests/tests/wasitests/unstable_close_preopen_fd.rs
index 38089722d96..48f26dee8d1 100644
--- a/lib/wasi-tests/tests/wasitests/close_preopen_fd.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_close_preopen_fd.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_close_preopen_fd() {
+fn test_unstable_close_preopen_fd() {
     assert_wasi_output!(
-        "../../wasitests/close_preopen_fd.wasm",
-        "close_preopen_fd",
+        "../../wasitests/unstable/close_preopen_fd.wasm",
+        "unstable_close_preopen_fd",
         vec![],
         vec![(
             "hamlet".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/create_dir.rs b/lib/wasi-tests/tests/wasitests/unstable_create_dir.rs
similarity index 73%
rename from lib/wasi-tests/tests/wasitests/create_dir.rs
rename to lib/wasi-tests/tests/wasitests/unstable_create_dir.rs
index 820cadd531c..bda8633f5cd 100644
--- a/lib/wasi-tests/tests/wasitests/create_dir.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_create_dir.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_create_dir() {
+fn test_unstable_create_dir() {
     assert_wasi_output!(
-        "../../wasitests/create_dir.wasm",
-        "create_dir",
+        "../../wasitests/unstable/create_dir.wasm",
+        "unstable_create_dir",
         vec![std::path::PathBuf::from("."),],
         vec![],
         vec![],
diff --git a/lib/wasi-tests/tests/wasitests/envvar.rs b/lib/wasi-tests/tests/wasitests/unstable_envvar.rs
similarity index 75%
rename from lib/wasi-tests/tests/wasitests/envvar.rs
rename to lib/wasi-tests/tests/wasitests/unstable_envvar.rs
index 9264b2ac7cf..0e0a8bfdd05 100644
--- a/lib/wasi-tests/tests/wasitests/envvar.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_envvar.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_envvar() {
+fn test_unstable_envvar() {
     assert_wasi_output!(
-        "../../wasitests/envvar.wasm",
-        "envvar",
+        "../../wasitests/unstable/envvar.wasm",
+        "unstable_envvar",
         vec![],
         vec![],
         vec!["DOG=1".to_string(), "CAT=2".to_string(),],
diff --git a/lib/wasi-tests/tests/wasitests/fd_allocate.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_allocate.rs
similarity index 76%
rename from lib/wasi-tests/tests/wasitests/fd_allocate.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fd_allocate.rs
index a45232f7aad..b3904f35a66 100644
--- a/lib/wasi-tests/tests/wasitests/fd_allocate.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fd_allocate.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fd_allocate() {
+fn test_unstable_fd_allocate() {
     assert_wasi_output!(
-        "../../wasitests/fd_allocate.wasm",
-        "fd_allocate",
+        "../../wasitests/unstable/fd_allocate.wasm",
+        "unstable_fd_allocate",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/fd_append.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_append.rs
similarity index 77%
rename from lib/wasi-tests/tests/wasitests/fd_append.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fd_append.rs
index 0ac3ea6ebf8..e23f9ec7b98 100644
--- a/lib/wasi-tests/tests/wasitests/fd_append.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fd_append.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fd_append() {
+fn test_unstable_fd_append() {
     assert_wasi_output!(
-        "../../wasitests/fd_append.wasm",
-        "fd_append",
+        "../../wasitests/unstable/fd_append.wasm",
+        "unstable_fd_append",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/fd_close.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_close.rs
similarity index 78%
rename from lib/wasi-tests/tests/wasitests/fd_close.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fd_close.rs
index 8bff35789d7..b2e47e364b9 100644
--- a/lib/wasi-tests/tests/wasitests/fd_close.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fd_close.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fd_close() {
+fn test_unstable_fd_close() {
     assert_wasi_output!(
-        "../../wasitests/fd_close.wasm",
-        "fd_close",
+        "../../wasitests/unstable/fd_close.wasm",
+        "unstable_fd_close",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/fd_pread.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_pread.rs
similarity index 78%
rename from lib/wasi-tests/tests/wasitests/fd_pread.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fd_pread.rs
index 01af04a139a..2661028ecd6 100644
--- a/lib/wasi-tests/tests/wasitests/fd_pread.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fd_pread.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fd_pread() {
+fn test_unstable_fd_pread() {
     assert_wasi_output!(
-        "../../wasitests/fd_pread.wasm",
-        "fd_pread",
+        "../../wasitests/unstable/fd_pread.wasm",
+        "unstable_fd_pread",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/fd_read.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_read.rs
similarity index 78%
rename from lib/wasi-tests/tests/wasitests/fd_read.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fd_read.rs
index 92649604198..dc9e90a3bcb 100644
--- a/lib/wasi-tests/tests/wasitests/fd_read.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fd_read.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fd_read() {
+fn test_unstable_fd_read() {
     assert_wasi_output!(
-        "../../wasitests/fd_read.wasm",
-        "fd_read",
+        "../../wasitests/unstable/fd_read.wasm",
+        "unstable_fd_read",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/fd_sync.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_sync.rs
similarity index 78%
rename from lib/wasi-tests/tests/wasitests/fd_sync.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fd_sync.rs
index 2540e503126..b8aca4143dc 100644
--- a/lib/wasi-tests/tests/wasitests/fd_sync.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fd_sync.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fd_sync() {
+fn test_unstable_fd_sync() {
     assert_wasi_output!(
-        "../../wasitests/fd_sync.wasm",
-        "fd_sync",
+        "../../wasitests/unstable/fd_sync.wasm",
+        "unstable_fd_sync",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/file_metadata.rs b/lib/wasi-tests/tests/wasitests/unstable_file_metadata.rs
similarity index 71%
rename from lib/wasi-tests/tests/wasitests/file_metadata.rs
rename to lib/wasi-tests/tests/wasitests/unstable_file_metadata.rs
index c05595beaae..fef1e35e426 100644
--- a/lib/wasi-tests/tests/wasitests/file_metadata.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_file_metadata.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_file_metadata() {
+fn test_unstable_file_metadata() {
     assert_wasi_output!(
-        "../../wasitests/file_metadata.wasm",
-        "file_metadata",
+        "../../wasitests/unstable/file_metadata.wasm",
+        "unstable_file_metadata",
         vec![std::path::PathBuf::from("."),],
         vec![],
         vec![],
diff --git a/lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs b/lib/wasi-tests/tests/wasitests/unstable_fs_sandbox_test.rs
similarity index 68%
rename from lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fs_sandbox_test.rs
index a1d1e4c4409..3caf3b299fe 100644
--- a/lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fs_sandbox_test.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fs_sandbox_test() {
+fn test_unstable_fs_sandbox_test() {
     assert_wasi_output!(
-        "../../wasitests/fs_sandbox_test.wasm",
-        "fs_sandbox_test",
+        "../../wasitests/unstable/fs_sandbox_test.wasm",
+        "unstable_fs_sandbox_test",
         vec![],
         vec![],
         vec![],
diff --git a/lib/wasi-tests/tests/wasitests/fseek.rs b/lib/wasi-tests/tests/wasitests/unstable_fseek.rs
similarity index 79%
rename from lib/wasi-tests/tests/wasitests/fseek.rs
rename to lib/wasi-tests/tests/wasitests/unstable_fseek.rs
index 0cc896aa818..f24185fc02b 100644
--- a/lib/wasi-tests/tests/wasitests/fseek.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_fseek.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_fseek() {
+fn test_unstable_fseek() {
     assert_wasi_output!(
-        "../../wasitests/fseek.wasm",
-        "fseek",
+        "../../wasitests/unstable/fseek.wasm",
+        "unstable_fseek",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/hello.rs b/lib/wasi-tests/tests/wasitests/unstable_hello.rs
similarity index 73%
rename from lib/wasi-tests/tests/wasitests/hello.rs
rename to lib/wasi-tests/tests/wasitests/unstable_hello.rs
index b9f28e7bc5d..9cbd7297b81 100644
--- a/lib/wasi-tests/tests/wasitests/hello.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_hello.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_hello() {
+fn test_unstable_hello() {
     assert_wasi_output!(
-        "../../wasitests/hello.wasm",
-        "hello",
+        "../../wasitests/unstable/hello.wasm",
+        "unstable_hello",
         vec![],
         vec![],
         vec![],
diff --git a/lib/wasi-tests/tests/wasitests/isatty.rs b/lib/wasi-tests/tests/wasitests/unstable_isatty.rs
similarity index 72%
rename from lib/wasi-tests/tests/wasitests/isatty.rs
rename to lib/wasi-tests/tests/wasitests/unstable_isatty.rs
index 55c97a60659..78138578834 100644
--- a/lib/wasi-tests/tests/wasitests/isatty.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_isatty.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_isatty() {
+fn test_unstable_isatty() {
     assert_wasi_output!(
-        "../../wasitests/isatty.wasm",
-        "isatty",
+        "../../wasitests/unstable/isatty.wasm",
+        "unstable_isatty",
         vec![],
         vec![],
         vec![],
diff --git a/lib/wasi-tests/tests/wasitests/mapdir.rs b/lib/wasi-tests/tests/wasitests/unstable_mapdir.rs
similarity index 78%
rename from lib/wasi-tests/tests/wasitests/mapdir.rs
rename to lib/wasi-tests/tests/wasitests/unstable_mapdir.rs
index 27064c8ae6b..180e8799684 100644
--- a/lib/wasi-tests/tests/wasitests/mapdir.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_mapdir.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_mapdir() {
+fn test_unstable_mapdir() {
     assert_wasi_output!(
-        "../../wasitests/mapdir.wasm",
-        "mapdir",
+        "../../wasitests/unstable/mapdir.wasm",
+        "unstable_mapdir",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/path_link.rs b/lib/wasi-tests/tests/wasitests/unstable_path_link.rs
similarity index 83%
rename from lib/wasi-tests/tests/wasitests/path_link.rs
rename to lib/wasi-tests/tests/wasitests/unstable_path_link.rs
index b035811eadb..09d9762bc8f 100644
--- a/lib/wasi-tests/tests/wasitests/path_link.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_path_link.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_path_link() {
+fn test_unstable_path_link() {
     assert_wasi_output!(
-        "../../wasitests/path_link.wasm",
-        "path_link",
+        "../../wasitests/unstable/path_link.wasm",
+        "unstable_path_link",
         vec![],
         vec![
             (
diff --git a/lib/wasi-tests/tests/wasitests/path_rename.rs b/lib/wasi-tests/tests/wasitests/unstable_path_rename.rs
similarity index 76%
rename from lib/wasi-tests/tests/wasitests/path_rename.rs
rename to lib/wasi-tests/tests/wasitests/unstable_path_rename.rs
index f623d80ba40..83c5585645c 100644
--- a/lib/wasi-tests/tests/wasitests/path_rename.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_path_rename.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_path_rename() {
+fn test_unstable_path_rename() {
     assert_wasi_output!(
-        "../../wasitests/path_rename.wasm",
-        "path_rename",
+        "../../wasitests/unstable/path_rename.wasm",
+        "unstable_path_rename",
         vec![],
         vec![(
             "temp".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/path_symlink.rs b/lib/wasi-tests/tests/wasitests/unstable_path_symlink.rs
similarity index 82%
rename from lib/wasi-tests/tests/wasitests/path_symlink.rs
rename to lib/wasi-tests/tests/wasitests/unstable_path_symlink.rs
index 2eeddc0a8d1..8bed0426d5b 100644
--- a/lib/wasi-tests/tests/wasitests/path_symlink.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_path_symlink.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_path_symlink() {
+fn test_unstable_path_symlink() {
     assert_wasi_output!(
-        "../../wasitests/path_symlink.wasm",
-        "path_symlink",
+        "../../wasitests/unstable/path_symlink.wasm",
+        "unstable_path_symlink",
         vec![],
         vec![
             (
diff --git a/lib/wasi-tests/tests/wasitests/poll_oneoff.rs b/lib/wasi-tests/tests/wasitests/unstable_poll_oneoff.rs
similarity index 82%
rename from lib/wasi-tests/tests/wasitests/poll_oneoff.rs
rename to lib/wasi-tests/tests/wasitests/unstable_poll_oneoff.rs
index 3200f4ad15a..8fc4b1ef3cf 100644
--- a/lib/wasi-tests/tests/wasitests/poll_oneoff.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_poll_oneoff.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_poll_oneoff() {
+fn test_unstable_poll_oneoff() {
     assert_wasi_output!(
-        "../../wasitests/poll_oneoff.wasm",
-        "poll_oneoff",
+        "../../wasitests/unstable/poll_oneoff.wasm",
+        "unstable_poll_oneoff",
         vec![],
         vec![
             (
diff --git a/lib/wasi-tests/tests/wasitests/quine.rs b/lib/wasi-tests/tests/wasitests/unstable_quine.rs
similarity index 75%
rename from lib/wasi-tests/tests/wasitests/quine.rs
rename to lib/wasi-tests/tests/wasitests/unstable_quine.rs
index c4139d95920..690704395e2 100644
--- a/lib/wasi-tests/tests/wasitests/quine.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_quine.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_quine() {
+fn test_unstable_quine() {
     assert_wasi_output!(
-        "../../wasitests/quine.wasm",
-        "quine",
+        "../../wasitests/unstable/quine.wasm",
+        "unstable_quine",
         vec![std::path::PathBuf::from("."),],
         vec![],
         vec![],
diff --git a/lib/wasi-tests/tests/wasitests/readlink.rs b/lib/wasi-tests/tests/wasitests/unstable_readlink.rs
similarity index 78%
rename from lib/wasi-tests/tests/wasitests/readlink.rs
rename to lib/wasi-tests/tests/wasitests/unstable_readlink.rs
index 22f72ff8160..66c1e1aaf41 100644
--- a/lib/wasi-tests/tests/wasitests/readlink.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_readlink.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_readlink() {
+fn test_unstable_readlink() {
     assert_wasi_output!(
-        "../../wasitests/readlink.wasm",
-        "readlink",
+        "../../wasitests/unstable/readlink.wasm",
+        "unstable_readlink",
         vec![],
         vec![(
             ".".to_string(),
diff --git a/lib/wasi-tests/tests/wasitests/wasi_sees_virtual_root.rs b/lib/wasi-tests/tests/wasitests/unstable_wasi_sees_virtual_root.rs
similarity index 82%
rename from lib/wasi-tests/tests/wasitests/wasi_sees_virtual_root.rs
rename to lib/wasi-tests/tests/wasitests/unstable_wasi_sees_virtual_root.rs
index ede1b0f38a4..df929306ad0 100644
--- a/lib/wasi-tests/tests/wasitests/wasi_sees_virtual_root.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_wasi_sees_virtual_root.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_wasi_sees_virtual_root() {
+fn test_unstable_wasi_sees_virtual_root() {
     assert_wasi_output!(
-        "../../wasitests/wasi_sees_virtual_root.wasm",
-        "wasi_sees_virtual_root",
+        "../../wasitests/unstable/wasi_sees_virtual_root.wasm",
+        "unstable_wasi_sees_virtual_root",
         vec![],
         vec![
             (
diff --git a/lib/wasi-tests/tests/wasitests/writing.rs b/lib/wasi-tests/tests/wasitests/unstable_writing.rs
similarity index 87%
rename from lib/wasi-tests/tests/wasitests/writing.rs
rename to lib/wasi-tests/tests/wasitests/unstable_writing.rs
index ce1a6a8c501..d964b29ff53 100644
--- a/lib/wasi-tests/tests/wasitests/writing.rs
+++ b/lib/wasi-tests/tests/wasitests/unstable_writing.rs
@@ -3,10 +3,10 @@
 // Files autogenerated with cargo build (build/wasitests.rs).
 
 #[test]
-fn test_writing() {
+fn test_unstable_writing() {
     assert_wasi_output!(
-        "../../wasitests/writing.wasm",
-        "writing",
+        "../../wasitests/unstable/writing.wasm",
+        "unstable_writing",
         vec![],
         vec![
             (
diff --git a/lib/wasi-tests/wasitests/close_preopen_fd.wasm b/lib/wasi-tests/wasitests/close_preopen_fd.wasm
deleted file mode 100755
index 5badfb755e5..00000000000
Binary files a/lib/wasi-tests/wasitests/close_preopen_fd.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/create_dir.wasm b/lib/wasi-tests/wasitests/create_dir.wasm
deleted file mode 100755
index 0c2fb0bbf08..00000000000
Binary files a/lib/wasi-tests/wasitests/create_dir.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/envvar.wasm b/lib/wasi-tests/wasitests/envvar.wasm
deleted file mode 100755
index b05151905a2..00000000000
Binary files a/lib/wasi-tests/wasitests/envvar.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fd_allocate.wasm b/lib/wasi-tests/wasitests/fd_allocate.wasm
deleted file mode 100755
index e604f6e407d..00000000000
Binary files a/lib/wasi-tests/wasitests/fd_allocate.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fd_append.wasm b/lib/wasi-tests/wasitests/fd_append.wasm
deleted file mode 100755
index af40f8af9c1..00000000000
Binary files a/lib/wasi-tests/wasitests/fd_append.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fd_close.wasm b/lib/wasi-tests/wasitests/fd_close.wasm
deleted file mode 100755
index 162e968755a..00000000000
Binary files a/lib/wasi-tests/wasitests/fd_close.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fd_pread.wasm b/lib/wasi-tests/wasitests/fd_pread.wasm
deleted file mode 100755
index 7b48e4959fc..00000000000
Binary files a/lib/wasi-tests/wasitests/fd_pread.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fd_read.wasm b/lib/wasi-tests/wasitests/fd_read.wasm
deleted file mode 100755
index 799ca164514..00000000000
Binary files a/lib/wasi-tests/wasitests/fd_read.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fd_sync.wasm b/lib/wasi-tests/wasitests/fd_sync.wasm
deleted file mode 100755
index 5fde9b62744..00000000000
Binary files a/lib/wasi-tests/wasitests/fd_sync.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/file_metadata.wasm b/lib/wasi-tests/wasitests/file_metadata.wasm
deleted file mode 100755
index 68c59917238..00000000000
Binary files a/lib/wasi-tests/wasitests/file_metadata.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fs_sandbox_test.wasm b/lib/wasi-tests/wasitests/fs_sandbox_test.wasm
deleted file mode 100755
index 8a8c6349451..00000000000
Binary files a/lib/wasi-tests/wasitests/fs_sandbox_test.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/fseek.wasm b/lib/wasi-tests/wasitests/fseek.wasm
deleted file mode 100755
index d3a7c8f8494..00000000000
Binary files a/lib/wasi-tests/wasitests/fseek.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/hello.wasm b/lib/wasi-tests/wasitests/hello.wasm
deleted file mode 100755
index a2625868b71..00000000000
Binary files a/lib/wasi-tests/wasitests/hello.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/ignores.txt b/lib/wasi-tests/wasitests/ignores.txt
index 8b137891791..df00fac5b05 100644
--- a/lib/wasi-tests/wasitests/ignores.txt
+++ b/lib/wasi-tests/wasitests/ignores.txt
@@ -1 +1,6 @@
-
+snapshot1_fd_read
+snapshot1_poll_oneoff
+snapshot1_fd_pread
+snapshot1_fd_close
+snapshot1_fd_allocate
+snapshot1_close_preopen_fd
diff --git a/lib/wasi-tests/wasitests/isatty.wasm b/lib/wasi-tests/wasitests/isatty.wasm
deleted file mode 100755
index 5a414754f9f..00000000000
Binary files a/lib/wasi-tests/wasitests/isatty.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/mapdir.wasm b/lib/wasi-tests/wasitests/mapdir.wasm
deleted file mode 100755
index 5675534ef0b..00000000000
Binary files a/lib/wasi-tests/wasitests/mapdir.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/path_link.wasm b/lib/wasi-tests/wasitests/path_link.wasm
deleted file mode 100755
index eae511069d0..00000000000
Binary files a/lib/wasi-tests/wasitests/path_link.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/path_rename.wasm b/lib/wasi-tests/wasitests/path_rename.wasm
deleted file mode 100755
index 7e613b96011..00000000000
Binary files a/lib/wasi-tests/wasitests/path_rename.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/path_symlink.wasm b/lib/wasi-tests/wasitests/path_symlink.wasm
deleted file mode 100755
index c30b1637864..00000000000
Binary files a/lib/wasi-tests/wasitests/path_symlink.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/poll_oneoff.wasm b/lib/wasi-tests/wasitests/poll_oneoff.wasm
deleted file mode 100755
index 009a57e8061..00000000000
Binary files a/lib/wasi-tests/wasitests/poll_oneoff.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/quine.wasm b/lib/wasi-tests/wasitests/quine.wasm
deleted file mode 100755
index 21fb813a378..00000000000
Binary files a/lib/wasi-tests/wasitests/quine.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/readlink.wasm b/lib/wasi-tests/wasitests/readlink.wasm
deleted file mode 100755
index d8ef0c74fee..00000000000
Binary files a/lib/wasi-tests/wasitests/readlink.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/close_preopen_fd.wasm b/lib/wasi-tests/wasitests/snapshot1/close_preopen_fd.wasm
new file mode 100755
index 00000000000..8a2613e066f
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/close_preopen_fd.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/create_dir.wasm b/lib/wasi-tests/wasitests/snapshot1/create_dir.wasm
new file mode 100755
index 00000000000..3e4e4903344
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/create_dir.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/envvar.wasm b/lib/wasi-tests/wasitests/snapshot1/envvar.wasm
new file mode 100755
index 00000000000..aac71d04bdb
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/envvar.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fd_allocate.wasm b/lib/wasi-tests/wasitests/snapshot1/fd_allocate.wasm
new file mode 100755
index 00000000000..88ab0fcde93
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fd_allocate.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fd_append.wasm b/lib/wasi-tests/wasitests/snapshot1/fd_append.wasm
new file mode 100755
index 00000000000..b3fb829793a
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fd_append.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fd_close.wasm b/lib/wasi-tests/wasitests/snapshot1/fd_close.wasm
new file mode 100755
index 00000000000..5b70a4e94f5
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fd_close.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fd_pread.wasm b/lib/wasi-tests/wasitests/snapshot1/fd_pread.wasm
new file mode 100755
index 00000000000..ff340ec0057
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fd_pread.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fd_read.wasm b/lib/wasi-tests/wasitests/snapshot1/fd_read.wasm
new file mode 100755
index 00000000000..4d4f8f1fa79
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fd_read.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fd_sync.wasm b/lib/wasi-tests/wasitests/snapshot1/fd_sync.wasm
new file mode 100755
index 00000000000..eb1c5b0d509
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fd_sync.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/file_metadata.wasm b/lib/wasi-tests/wasitests/snapshot1/file_metadata.wasm
new file mode 100755
index 00000000000..c9d58dd75b1
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/file_metadata.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fs_sandbox_test.wasm b/lib/wasi-tests/wasitests/snapshot1/fs_sandbox_test.wasm
new file mode 100755
index 00000000000..33237a18aa6
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fs_sandbox_test.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/fseek.wasm b/lib/wasi-tests/wasitests/snapshot1/fseek.wasm
new file mode 100755
index 00000000000..14030ba1a70
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/fseek.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/hello.wasm b/lib/wasi-tests/wasitests/snapshot1/hello.wasm
new file mode 100755
index 00000000000..3aeedc2bc4a
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/hello.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/isatty.wasm b/lib/wasi-tests/wasitests/snapshot1/isatty.wasm
new file mode 100755
index 00000000000..660c4ac8f7e
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/isatty.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/mapdir.wasm b/lib/wasi-tests/wasitests/snapshot1/mapdir.wasm
new file mode 100755
index 00000000000..d19f845f755
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/mapdir.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/path_link.wasm b/lib/wasi-tests/wasitests/snapshot1/path_link.wasm
new file mode 100755
index 00000000000..8c95ec1e483
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/path_link.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/path_rename.wasm b/lib/wasi-tests/wasitests/snapshot1/path_rename.wasm
new file mode 100755
index 00000000000..82ae2075788
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/path_rename.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/path_symlink.wasm b/lib/wasi-tests/wasitests/snapshot1/path_symlink.wasm
new file mode 100755
index 00000000000..a7ec5c58c24
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/path_symlink.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/poll_oneoff.wasm b/lib/wasi-tests/wasitests/snapshot1/poll_oneoff.wasm
new file mode 100755
index 00000000000..1e8d2280371
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/poll_oneoff.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/quine.wasm b/lib/wasi-tests/wasitests/snapshot1/quine.wasm
new file mode 100755
index 00000000000..ea2342d4dd6
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/quine.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/readlink.wasm b/lib/wasi-tests/wasitests/snapshot1/readlink.wasm
new file mode 100755
index 00000000000..20f2c6b5b8c
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/readlink.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/wasi_sees_virtual_root.wasm b/lib/wasi-tests/wasitests/snapshot1/wasi_sees_virtual_root.wasm
new file mode 100755
index 00000000000..8b5ab8ef951
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/wasi_sees_virtual_root.wasm differ
diff --git a/lib/wasi-tests/wasitests/snapshot1/writing.wasm b/lib/wasi-tests/wasitests/snapshot1/writing.wasm
new file mode 100755
index 00000000000..d1c9e04e034
Binary files /dev/null and b/lib/wasi-tests/wasitests/snapshot1/writing.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/close_preopen_fd.wasm b/lib/wasi-tests/wasitests/unstable/close_preopen_fd.wasm
new file mode 100755
index 00000000000..90e80c147a5
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/close_preopen_fd.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/create_dir.wasm b/lib/wasi-tests/wasitests/unstable/create_dir.wasm
new file mode 100755
index 00000000000..e5c03ba284f
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/create_dir.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/envvar.wasm b/lib/wasi-tests/wasitests/unstable/envvar.wasm
new file mode 100755
index 00000000000..bb2fc016e6d
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/envvar.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fd_allocate.wasm b/lib/wasi-tests/wasitests/unstable/fd_allocate.wasm
new file mode 100755
index 00000000000..3faba16c76c
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fd_allocate.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fd_append.wasm b/lib/wasi-tests/wasitests/unstable/fd_append.wasm
new file mode 100755
index 00000000000..011b52aa359
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fd_append.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fd_close.wasm b/lib/wasi-tests/wasitests/unstable/fd_close.wasm
new file mode 100755
index 00000000000..1b1e41d0aea
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fd_close.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fd_pread.wasm b/lib/wasi-tests/wasitests/unstable/fd_pread.wasm
new file mode 100755
index 00000000000..9aa800fc02f
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fd_pread.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fd_read.wasm b/lib/wasi-tests/wasitests/unstable/fd_read.wasm
new file mode 100755
index 00000000000..9706a7376fa
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fd_read.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fd_sync.wasm b/lib/wasi-tests/wasitests/unstable/fd_sync.wasm
new file mode 100755
index 00000000000..33ca621603b
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fd_sync.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/file_metadata.wasm b/lib/wasi-tests/wasitests/unstable/file_metadata.wasm
new file mode 100755
index 00000000000..f56a1935385
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/file_metadata.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fs_sandbox_test.wasm b/lib/wasi-tests/wasitests/unstable/fs_sandbox_test.wasm
new file mode 100755
index 00000000000..cb8d4b0bf3b
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fs_sandbox_test.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/fseek.wasm b/lib/wasi-tests/wasitests/unstable/fseek.wasm
new file mode 100755
index 00000000000..43bc99fb4a1
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/fseek.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/hello.wasm b/lib/wasi-tests/wasitests/unstable/hello.wasm
new file mode 100755
index 00000000000..ca8a2ff0b05
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/hello.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/isatty.wasm b/lib/wasi-tests/wasitests/unstable/isatty.wasm
new file mode 100755
index 00000000000..13eb63f9fa3
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/isatty.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/mapdir.wasm b/lib/wasi-tests/wasitests/unstable/mapdir.wasm
new file mode 100755
index 00000000000..fb5ddecb87d
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/mapdir.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/path_link.wasm b/lib/wasi-tests/wasitests/unstable/path_link.wasm
new file mode 100755
index 00000000000..6b1bdd3dfe4
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/path_link.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/path_rename.wasm b/lib/wasi-tests/wasitests/unstable/path_rename.wasm
new file mode 100755
index 00000000000..6cd2fd36eab
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/path_rename.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/path_symlink.wasm b/lib/wasi-tests/wasitests/unstable/path_symlink.wasm
new file mode 100755
index 00000000000..ffed50e3cee
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/path_symlink.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/poll_oneoff.wasm b/lib/wasi-tests/wasitests/unstable/poll_oneoff.wasm
new file mode 100755
index 00000000000..cd55e3e1c64
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/poll_oneoff.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/quine.wasm b/lib/wasi-tests/wasitests/unstable/quine.wasm
new file mode 100755
index 00000000000..bf21075995a
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/quine.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/readlink.wasm b/lib/wasi-tests/wasitests/unstable/readlink.wasm
new file mode 100755
index 00000000000..48f2afa84fb
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/readlink.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/wasi_sees_virtual_root.wasm b/lib/wasi-tests/wasitests/unstable/wasi_sees_virtual_root.wasm
new file mode 100755
index 00000000000..59fc97c2b72
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/wasi_sees_virtual_root.wasm differ
diff --git a/lib/wasi-tests/wasitests/unstable/writing.wasm b/lib/wasi-tests/wasitests/unstable/writing.wasm
new file mode 100755
index 00000000000..bbdf39ff158
Binary files /dev/null and b/lib/wasi-tests/wasitests/unstable/writing.wasm differ
diff --git a/lib/wasi-tests/wasitests/wasi_sees_virtual_root.wasm b/lib/wasi-tests/wasitests/wasi_sees_virtual_root.wasm
deleted file mode 100755
index 0abf7729494..00000000000
Binary files a/lib/wasi-tests/wasitests/wasi_sees_virtual_root.wasm and /dev/null differ
diff --git a/lib/wasi-tests/wasitests/writing.wasm b/lib/wasi-tests/wasitests/writing.wasm
deleted file mode 100755
index 0b8b96abcdf..00000000000
Binary files a/lib/wasi-tests/wasitests/writing.wasm and /dev/null differ