diff --git a/Cargo.toml b/Cargo.toml
index e50cd24b43..76484a280c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,6 +60,7 @@ wat = "1.0.47"
 once_cell = "1.9.0"
 rayon = "1.5.0"
 component-macro-test = { path = "crates/misc/component-macro-test" }
+wasmtime-wast = { path = "crates/wast", version = "=0.40.0", features = ['component-model'] }
 
 [target.'cfg(windows)'.dev-dependencies]
 windows-sys = { version = "0.36.0", features = ["Win32_System_Memory"] }
diff --git a/build.rs b/build.rs
index 18e4c80e7c..17ae15aa54 100644
--- a/build.rs
+++ b/build.rs
@@ -28,9 +28,7 @@ fn main() -> anyhow::Result<()> {
             test_directory_module(out, "tests/misc_testsuite/simd", strategy)?;
             test_directory_module(out, "tests/misc_testsuite/threads", strategy)?;
             test_directory_module(out, "tests/misc_testsuite/memory64", strategy)?;
-            if cfg!(feature = "component-model") {
-                test_directory_module(out, "tests/misc_testsuite/component-model", strategy)?;
-            }
+            test_directory_module(out, "tests/misc_testsuite/component-model", strategy)?;
             Ok(())
         })?;
 
diff --git a/tests/all/component_model.rs b/tests/all/component_model.rs
index 4ebb3b6125..ada10f49c9 100644
--- a/tests/all/component_model.rs
+++ b/tests/all/component_model.rs
@@ -88,6 +88,8 @@ const REALLOC_AND_FREE: &str = r#"
 "#;
 
 fn engine() -> Engine {
+    drop(env_logger::try_init());
+
     let mut config = Config::new();
     config.wasm_component_model(true);