diff --git a/lib/emscripten-tests/Cargo.toml b/lib/emscripten-tests/Cargo.toml
index 659579ed1..fc8510b56 100644
--- a/lib/emscripten-tests/Cargo.toml
+++ b/lib/emscripten-tests/Cargo.toml
@@ -25,5 +25,4 @@ glob = "0.2.11"
 [features]
 clif = []
 llvm = ["wasmer-llvm-backend"]
-singlepass = ["wasmer-singlepass-backend"]
-debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]
+singlepass = ["wasmer-singlepass-backend"]
\ No newline at end of file
diff --git a/lib/emscripten-tests/src/lib.rs b/lib/emscripten-tests/src/lib.rs
index 5df757613..1da0abc73 100644
--- a/lib/emscripten-tests/src/lib.rs
+++ b/lib/emscripten-tests/src/lib.rs
@@ -1 +1,53 @@
-// nothing to see here
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+    use wabt::wat2wasm;
+    use wasmer_emscripten::is_emscripten_module;
+    use wasmer_runtime_core::backend::Compiler;
+    use wasmer_runtime_core::compile_with;
+
+    #[cfg(feature = "clif")]
+    fn get_compiler() -> impl Compiler {
+        use wasmer_clif_backend::CraneliftCompiler;
+        CraneliftCompiler::new()
+    }
+
+    #[cfg(feature = "llvm")]
+    fn get_compiler() -> impl Compiler {
+        use wasmer_llvm_backend::LLVMCompiler;
+        LLVMCompiler::new()
+    }
+
+    #[cfg(feature = "singlepass")]
+    fn get_compiler() -> impl Compiler {
+        use wasmer_singlepass_backend::SinglePassCompiler;
+        SinglePassCompiler::new()
+    }
+
+    #[cfg(not(any(feature = "llvm", feature = "clif", feature = "singlepass")))]
+    fn get_compiler() -> impl Compiler {
+        panic!("compiler not specified, activate a compiler via features");
+        use wasmer_clif_backend::CraneliftCompiler;
+        CraneliftCompiler::new()
+    }
+
+    #[test]
+    fn should_detect_emscripten_files() {
+        const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_true.wast");
+        let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm");
+        let module =
+            compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled");
+        let module = Arc::new(module);
+        assert!(is_emscripten_module(&module));
+    }
+
+    #[test]
+    fn should_detect_non_emscripten_files() {
+        const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_false.wast");
+        let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm");
+        let module =
+            compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled");
+        let module = Arc::new(module);
+        assert!(!is_emscripten_module(&module));
+    }
+}
diff --git a/lib/emscripten/src/tests/is_emscripten_false.wast b/lib/emscripten-tests/src/tests/is_emscripten_false.wast
similarity index 100%
rename from lib/emscripten/src/tests/is_emscripten_false.wast
rename to lib/emscripten-tests/src/tests/is_emscripten_false.wast
diff --git a/lib/emscripten/src/tests/is_emscripten_true.wast b/lib/emscripten-tests/src/tests/is_emscripten_true.wast
similarity index 100%
rename from lib/emscripten/src/tests/is_emscripten_true.wast
rename to lib/emscripten-tests/src/tests/is_emscripten_true.wast
diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml
index 41841e3b6..995325595 100644
--- a/lib/emscripten/Cargo.toml
+++ b/lib/emscripten/Cargo.toml
@@ -16,4 +16,7 @@ time = "0.1.41"
 wasmer-runtime-core = { path = "../runtime-core", version = "0.5.4" }
 
 [target.'cfg(windows)'.dependencies]
-rand = "0.6"
\ No newline at end of file
+rand = "0.6"
+
+[features]
+debug = ["wasmer-runtime-core/debug"]
\ No newline at end of file
diff --git a/lib/emscripten/src/utils.rs b/lib/emscripten/src/utils.rs
index e3370fdad..4bf8fe2d3 100644
--- a/lib/emscripten/src/utils.rs
+++ b/lib/emscripten/src/utils.rs
@@ -263,57 +263,3 @@ pub fn get_current_directory(ctx: &mut Ctx) -> Option<PathBuf> {
         })
         .ok()
 }
-
-#[cfg(test)]
-mod tests {
-    use super::is_emscripten_module;
-    use std::sync::Arc;
-    use wabt::wat2wasm;
-    use wasmer_runtime_core::backend::Compiler;
-    use wasmer_runtime_core::compile_with;
-
-    #[cfg(feature = "clif")]
-    fn get_compiler() -> impl Compiler {
-        use wasmer_clif_backend::CraneliftCompiler;
-        CraneliftCompiler::new()
-    }
-
-    #[cfg(feature = "llvm")]
-    fn get_compiler() -> impl Compiler {
-        use wasmer_llvm_backend::LLVMCompiler;
-        LLVMCompiler::new()
-    }
-
-    #[cfg(feature = "singlepass")]
-    fn get_compiler() -> impl Compiler {
-        use wasmer_singlepass_backend::SinglePassCompiler;
-        SinglePassCompiler::new()
-    }
-
-    #[cfg(not(any(feature = "llvm", feature = "clif", feature = "singlepass")))]
-    fn get_compiler() -> impl Compiler {
-        panic!("compiler not specified, activate a compiler via features");
-        use wasmer_clif_backend::CraneliftCompiler;
-        CraneliftCompiler::new()
-    }
-
-    #[test]
-    fn should_detect_emscripten_files() {
-        const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_true.wast");
-        let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm");
-        let module =
-            compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled");
-        let module = Arc::new(module);
-        assert!(is_emscripten_module(&module));
-    }
-
-    #[test]
-    fn should_detect_non_emscripten_files() {
-        const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_false.wast");
-        let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm");
-        let module =
-            compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled");
-        let module = Arc::new(module);
-        assert!(!is_emscripten_module(&module));
-    }
-}