diff --git a/Cargo.lock b/Cargo.lock
index 087094ff4..7df8f8a65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1432,6 +1432,7 @@ dependencies = [
  "wasmer-runtime-core 0.5.4",
  "wasmer-singlepass-backend 0.5.4",
  "wasmer-wasi 0.5.4",
+ "wasmer-wasi-tests 0.5.4",
 ]
 
 [[package]]
@@ -1614,17 +1615,25 @@ version = "0.5.4"
 dependencies = [
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "generational-arena 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.57 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-runtime-core 0.5.4",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasmer-wasi-tests"
+version = "0.5.4"
+dependencies = [
+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmer-clif-backend 0.5.4",
  "wasmer-dev-utils 0.5.4",
  "wasmer-llvm-backend 0.5.4",
  "wasmer-runtime-core 0.5.4",
  "wasmer-singlepass-backend 0.5.4",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmer-wasi 0.5.4",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index aef63f767..0783c4148 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,6 +35,7 @@ wasmer-llvm-backend = { path = "lib/llvm-backend", optional = true }
 wasmer-wasi = { path = "lib/wasi", optional = true }
 wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true }
 wasmer-dev-utils = { path = "lib/dev-utils", optional = true }
+wasmer-wasi-tests = { path = "lib/wasi-tests", optional = true }
 
 [workspace]
 members = [
@@ -53,6 +54,7 @@ members = [
     "lib/kernel-loader",
     "lib/kernel-net",
     "lib/dev-utils",
+    "lib/wasi-tests",
     "examples/plugin-for-example"
 ]
 
diff --git a/Makefile b/Makefile
index f6234bade..fd41e8131 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ generate-emtests:
 	WASM_EMSCRIPTEN_GENERATE_EMTESTS=1 cargo build -p wasmer-emscripten --release
 
 generate-wasitests:
-	WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi --release
+	WASM_WASI_GENERATE_WASITESTS=1 cargo build -p wasmer-wasi-tests --release
 
 generate: generate-spectests generate-emtests generate-wasitests
 
@@ -54,13 +54,13 @@ middleware: middleware-singlepass middleware-cranelift middleware-llvm
 
 # Wasitests
 wasitests-singlepass:
-	cargo test --manifest-path lib/wasi/Cargo.toml --release --features singlepass -- --test-threads=1
+	cargo test --manifest-path lib/wasi-tests/Cargo.toml --release --features singlepass -- --test-threads=1
 
 wasitests-cranelift:
-	cargo test --manifest-path lib/wasi/Cargo.toml --release --features clif -- --test-threads=1
+	cargo test --manifest-path lib/wasi-tests/Cargo.toml --release --features clif -- --test-threads=1
 
 wasitests-llvm:
-	cargo test --manifest-path lib/wasi/Cargo.toml --release --features llvm -- --test-threads=1
+	cargo test --manifest-path lib/wasi-tests/Cargo.toml --release --features llvm -- --test-threads=1
 
 wasitests: wasitests-singlepass wasitests-cranelift wasitests-llvm
 
@@ -83,7 +83,7 @@ capi:
 	cargo test -p wasmer-runtime-c-api --release
 
 test-rest: capi
-	cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend
+	cargo test --release --all --exclude wasmer-runtime-c-api --exclude wasmer-emscripten --exclude wasmer-spectests --exclude wasmer-wasi --exclude wasmer-middleware-common --exclude wasmer-singlepass-backend --exclude wasmer-clif-backend --exclude wasmer-llvm-backend --exclude wasmer-wasi-tests
 
 circleci-clean:
 	@if [ ! -z "${CIRCLE_JOB}" ]; then rm -f /home/circleci/project/target/debug/deps/libcranelift_wasm* && rm -f /Users/distiller/project/target/debug/deps/libcranelift_wasm*; fi;
@@ -147,4 +147,4 @@ publish-release:
 # cargo install cargo-deps
 # must install graphviz for `dot`
 dep-graph:
-	cargo deps --optional-deps --filter wasmer-wasi wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png
+	cargo deps --optional-deps --filter wasmer-wasi wasmer-wasi-tests wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png
diff --git a/lib/wasi-tests/Cargo.toml b/lib/wasi-tests/Cargo.toml
new file mode 100644
index 000000000..5b348752a
--- /dev/null
+++ b/lib/wasi-tests/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "wasmer-wasi-tests"
+version = "0.5.4"
+description = "Tests for our WASI implementation"
+license = "MIT"
+authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
+edition = "2018"
+publish = false
+build = "build/mod.rs"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" }
+wasmer-wasi = { path = "../wasi", version = "0.5.4" }
+# hack to get tests to work
+wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true }
+
+
+[build-dependencies]
+glob = "0.2.11"
+
+[dev-dependencies]
+wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" }
+wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"}
+
+[features]
+clif = []
+singlepass = ["wasmer-singlepass-backend"]
+llvm = ["wasmer-llvm-backend"]
diff --git a/lib/wasi/build/mod.rs b/lib/wasi-tests/build/mod.rs
similarity index 100%
rename from lib/wasi/build/mod.rs
rename to lib/wasi-tests/build/mod.rs
diff --git a/lib/wasi/build/wasitests.rs b/lib/wasi-tests/build/wasitests.rs
similarity index 100%
rename from lib/wasi/build/wasitests.rs
rename to lib/wasi-tests/build/wasitests.rs
diff --git a/lib/wasi-tests/src/lib.rs b/lib/wasi-tests/src/lib.rs
new file mode 100644
index 000000000..5df757613
--- /dev/null
+++ b/lib/wasi-tests/src/lib.rs
@@ -0,0 +1 @@
+// nothing to see here
diff --git a/lib/wasi/tests/wasitest.rs b/lib/wasi-tests/tests/wasitest.rs
similarity index 100%
rename from lib/wasi/tests/wasitest.rs
rename to lib/wasi-tests/tests/wasitest.rs
diff --git a/lib/wasi/tests/wasitests/_common.rs b/lib/wasi-tests/tests/wasitests/_common.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/_common.rs
rename to lib/wasi-tests/tests/wasitests/_common.rs
diff --git a/lib/wasi/tests/wasitests/create_dir.rs b/lib/wasi-tests/tests/wasitests/create_dir.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/create_dir.rs
rename to lib/wasi-tests/tests/wasitests/create_dir.rs
diff --git a/lib/wasi/tests/wasitests/envvar.rs b/lib/wasi-tests/tests/wasitests/envvar.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/envvar.rs
rename to lib/wasi-tests/tests/wasitests/envvar.rs
diff --git a/lib/wasi/tests/wasitests/file_metadata.rs b/lib/wasi-tests/tests/wasitests/file_metadata.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/file_metadata.rs
rename to lib/wasi-tests/tests/wasitests/file_metadata.rs
diff --git a/lib/wasi/tests/wasitests/fs_sandbox_test.rs b/lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/fs_sandbox_test.rs
rename to lib/wasi-tests/tests/wasitests/fs_sandbox_test.rs
diff --git a/lib/wasi/tests/wasitests/hello.rs b/lib/wasi-tests/tests/wasitests/hello.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/hello.rs
rename to lib/wasi-tests/tests/wasitests/hello.rs
diff --git a/lib/wasi/tests/wasitests/mapdir.rs b/lib/wasi-tests/tests/wasitests/mapdir.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/mapdir.rs
rename to lib/wasi-tests/tests/wasitests/mapdir.rs
diff --git a/lib/wasi/tests/wasitests/mod.rs b/lib/wasi-tests/tests/wasitests/mod.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/mod.rs
rename to lib/wasi-tests/tests/wasitests/mod.rs
diff --git a/lib/wasi/tests/wasitests/quine.rs b/lib/wasi-tests/tests/wasitests/quine.rs
similarity index 100%
rename from lib/wasi/tests/wasitests/quine.rs
rename to lib/wasi-tests/tests/wasitests/quine.rs
diff --git a/lib/wasi/wasitests/create_dir.out b/lib/wasi-tests/wasitests/create_dir.out
similarity index 100%
rename from lib/wasi/wasitests/create_dir.out
rename to lib/wasi-tests/wasitests/create_dir.out
diff --git a/lib/wasi/wasitests/create_dir.rs b/lib/wasi-tests/wasitests/create_dir.rs
similarity index 100%
rename from lib/wasi/wasitests/create_dir.rs
rename to lib/wasi-tests/wasitests/create_dir.rs
diff --git a/lib/wasi-tests/wasitests/create_dir.wasm b/lib/wasi-tests/wasitests/create_dir.wasm
new file mode 100755
index 000000000..adfb1c2d3
Binary files /dev/null and b/lib/wasi-tests/wasitests/create_dir.wasm differ
diff --git a/lib/wasi/wasitests/envvar.out b/lib/wasi-tests/wasitests/envvar.out
similarity index 100%
rename from lib/wasi/wasitests/envvar.out
rename to lib/wasi-tests/wasitests/envvar.out
diff --git a/lib/wasi/wasitests/envvar.rs b/lib/wasi-tests/wasitests/envvar.rs
similarity index 100%
rename from lib/wasi/wasitests/envvar.rs
rename to lib/wasi-tests/wasitests/envvar.rs
diff --git a/lib/wasi-tests/wasitests/envvar.wasm b/lib/wasi-tests/wasitests/envvar.wasm
new file mode 100755
index 000000000..2fb521f3c
Binary files /dev/null and b/lib/wasi-tests/wasitests/envvar.wasm differ
diff --git a/lib/wasi/wasitests/file_metadata.out b/lib/wasi-tests/wasitests/file_metadata.out
similarity index 100%
rename from lib/wasi/wasitests/file_metadata.out
rename to lib/wasi-tests/wasitests/file_metadata.out
diff --git a/lib/wasi/wasitests/file_metadata.rs b/lib/wasi-tests/wasitests/file_metadata.rs
similarity index 100%
rename from lib/wasi/wasitests/file_metadata.rs
rename to lib/wasi-tests/wasitests/file_metadata.rs
diff --git a/lib/wasi-tests/wasitests/file_metadata.wasm b/lib/wasi-tests/wasitests/file_metadata.wasm
new file mode 100755
index 000000000..a51bcdf7d
Binary files /dev/null and b/lib/wasi-tests/wasitests/file_metadata.wasm differ
diff --git a/lib/wasi/wasitests/fs_sandbox_test.out b/lib/wasi-tests/wasitests/fs_sandbox_test.out
similarity index 100%
rename from lib/wasi/wasitests/fs_sandbox_test.out
rename to lib/wasi-tests/wasitests/fs_sandbox_test.out
diff --git a/lib/wasi/wasitests/fs_sandbox_test.rs b/lib/wasi-tests/wasitests/fs_sandbox_test.rs
similarity index 100%
rename from lib/wasi/wasitests/fs_sandbox_test.rs
rename to lib/wasi-tests/wasitests/fs_sandbox_test.rs
diff --git a/lib/wasi-tests/wasitests/fs_sandbox_test.wasm b/lib/wasi-tests/wasitests/fs_sandbox_test.wasm
new file mode 100755
index 000000000..f41bc5a17
Binary files /dev/null and b/lib/wasi-tests/wasitests/fs_sandbox_test.wasm differ
diff --git a/lib/wasi/wasitests/hello.out b/lib/wasi-tests/wasitests/hello.out
similarity index 100%
rename from lib/wasi/wasitests/hello.out
rename to lib/wasi-tests/wasitests/hello.out
diff --git a/lib/wasi/wasitests/hello.rs b/lib/wasi-tests/wasitests/hello.rs
similarity index 100%
rename from lib/wasi/wasitests/hello.rs
rename to lib/wasi-tests/wasitests/hello.rs
diff --git a/lib/wasi-tests/wasitests/hello.wasm b/lib/wasi-tests/wasitests/hello.wasm
new file mode 100755
index 000000000..958d5e36d
Binary files /dev/null and b/lib/wasi-tests/wasitests/hello.wasm differ
diff --git a/lib/wasi/wasitests/ignores.txt b/lib/wasi-tests/wasitests/ignores.txt
similarity index 100%
rename from lib/wasi/wasitests/ignores.txt
rename to lib/wasi-tests/wasitests/ignores.txt
diff --git a/lib/wasi/wasitests/mapdir.out b/lib/wasi-tests/wasitests/mapdir.out
similarity index 100%
rename from lib/wasi/wasitests/mapdir.out
rename to lib/wasi-tests/wasitests/mapdir.out
diff --git a/lib/wasi/wasitests/mapdir.rs b/lib/wasi-tests/wasitests/mapdir.rs
similarity index 100%
rename from lib/wasi/wasitests/mapdir.rs
rename to lib/wasi-tests/wasitests/mapdir.rs
diff --git a/lib/wasi-tests/wasitests/mapdir.wasm b/lib/wasi-tests/wasitests/mapdir.wasm
new file mode 100755
index 000000000..32e34888c
Binary files /dev/null and b/lib/wasi-tests/wasitests/mapdir.wasm differ
diff --git a/lib/wasi/wasitests/quine.out b/lib/wasi-tests/wasitests/quine.out
similarity index 100%
rename from lib/wasi/wasitests/quine.out
rename to lib/wasi-tests/wasitests/quine.out
diff --git a/lib/wasi/wasitests/quine.rs b/lib/wasi-tests/wasitests/quine.rs
similarity index 100%
rename from lib/wasi/wasitests/quine.rs
rename to lib/wasi-tests/wasitests/quine.rs
diff --git a/lib/wasi-tests/wasitests/quine.wasm b/lib/wasi-tests/wasitests/quine.wasm
new file mode 100755
index 000000000..3b195bb08
Binary files /dev/null and b/lib/wasi-tests/wasitests/quine.wasm differ
diff --git a/lib/wasi/wasitests/test_fs/README.md b/lib/wasi-tests/wasitests/test_fs/README.md
similarity index 100%
rename from lib/wasi/wasitests/test_fs/README.md
rename to lib/wasi-tests/wasitests/test_fs/README.md
diff --git a/lib/wasi/wasitests/test_fs/hamlet/README.md b/lib/wasi-tests/wasitests/test_fs/hamlet/README.md
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/README.md
rename to lib/wasi-tests/wasitests/test_fs/hamlet/README.md
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene1.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene1.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene1.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene2.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene2.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene2.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene3.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene3.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene3.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene3.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene4.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene4.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene4.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene4.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act1/scene5.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene5.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act1/scene5.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act1/scene5.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act2/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene1.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act2/scene1.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene1.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act2/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene2.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act2/scene2.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act2/scene2.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene1.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene1.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene1.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene2.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene2.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene2.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene3.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene3.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene3.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene3.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act3/scene4.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene4.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act3/scene4.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act3/scene4.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene1.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene1.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene1.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene2.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene2.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene2.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene3.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene3.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene3.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene3.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene4.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene4.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene4.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene4.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene5.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene5.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene5.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene5.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene6.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene6.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene6.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene6.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act4/scene7.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene7.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act4/scene7.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act4/scene7.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act5/scene1.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene1.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act5/scene1.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene1.txt
diff --git a/lib/wasi/wasitests/test_fs/hamlet/act5/scene2.txt b/lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene2.txt
similarity index 100%
rename from lib/wasi/wasitests/test_fs/hamlet/act5/scene2.txt
rename to lib/wasi-tests/wasitests/test_fs/hamlet/act5/scene2.txt
diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml
index 4780a21b6..28426be0d 100644
--- a/lib/wasi/Cargo.toml
+++ b/lib/wasi/Cargo.toml
@@ -6,7 +6,6 @@ license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
 repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
-build = "build/mod.rs"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" }
@@ -17,21 +16,6 @@ hashbrown = "0.1.8"
 generational-arena = "0.2.2"
 log = "0.4.6"
 byteorder = "1.3.1"
-# hack to get tests to work
-wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.4", optional = true }
-wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.4", optional = true }
 
 [target.'cfg(windows)'.dependencies]
-winapi = "0.3"
-
-[build-dependencies]
-glob = "0.2.11"
-
-[dev-dependencies]
-wasmer-clif-backend = { path = "../clif-backend", version = "0.5.4" }
-wasmer-dev-utils = { path = "../dev-utils", version = "0.5.4"}
-
-[features]
-clif = []
-singlepass = ["wasmer-singlepass-backend"]
-llvm = ["wasmer-llvm-backend"]
+winapi = "0.3"
\ No newline at end of file
diff --git a/lib/wasi/wasitests/create_dir.wasm b/lib/wasi/wasitests/create_dir.wasm
deleted file mode 100755
index a8ec3cb5a..000000000
Binary files a/lib/wasi/wasitests/create_dir.wasm and /dev/null differ
diff --git a/lib/wasi/wasitests/envvar.wasm b/lib/wasi/wasitests/envvar.wasm
deleted file mode 100755
index 14bf02996..000000000
Binary files a/lib/wasi/wasitests/envvar.wasm and /dev/null differ
diff --git a/lib/wasi/wasitests/file_metadata.wasm b/lib/wasi/wasitests/file_metadata.wasm
deleted file mode 100755
index bc6fe76ff..000000000
Binary files a/lib/wasi/wasitests/file_metadata.wasm and /dev/null differ
diff --git a/lib/wasi/wasitests/fs_sandbox_test.wasm b/lib/wasi/wasitests/fs_sandbox_test.wasm
deleted file mode 100755
index e3b55f0c1..000000000
Binary files a/lib/wasi/wasitests/fs_sandbox_test.wasm and /dev/null differ
diff --git a/lib/wasi/wasitests/hello.wasm b/lib/wasi/wasitests/hello.wasm
deleted file mode 100755
index 58114e759..000000000
Binary files a/lib/wasi/wasitests/hello.wasm and /dev/null differ
diff --git a/lib/wasi/wasitests/mapdir.wasm b/lib/wasi/wasitests/mapdir.wasm
deleted file mode 100755
index a4f32480d..000000000
Binary files a/lib/wasi/wasitests/mapdir.wasm and /dev/null differ
diff --git a/lib/wasi/wasitests/quine.wasm b/lib/wasi/wasitests/quine.wasm
deleted file mode 100755
index 45d739f04..000000000
Binary files a/lib/wasi/wasitests/quine.wasm and /dev/null differ