diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6ba9530199e82b05969552214eaf368556342001..3e16d3ca71a0590a9f8ce057352f7a6da83d0a8d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -56,6 +56,8 @@ jobs:
           cargo run -- contract new foobar
           echo "[workspace]" >> foobar/Cargo.toml
           cargo run -- contract build --manifest-path=foobar/Cargo.toml
+          cargo run -- contract check --manifest-path=foobar/Cargo.toml
+          cargo run -- contract test --manifest-path=foobar/Cargo.toml
 
       - name: Run tests on {{ matrix.platform }}-${{ matrix.toolchain }}
         # The tests take a long time in the GitHub Actions runner (~30 mins),
diff --git a/src/cmd/build.rs b/src/cmd/build.rs
index bafa1d31372fbc8ae18a567f443b8dcced5a6d1a..c43f90063f0f8998444c90da2bdb3e0842dde2be 100644
--- a/src/cmd/build.rs
+++ b/src/cmd/build.rs
@@ -201,7 +201,7 @@ fn exec_cargo_for_wasm_target(
     // Currently will override user defined RUSTFLAGS from .cargo/config. See https://github.com/paritytech/cargo-contract/issues/98.
     std::env::set_var(
         "RUSTFLAGS",
-        "-C link-arg=-z -C link-arg=stack-size=65536 -C link-arg=--import-memory",
+        "-C link-arg=-zstack-size=65536 -C link-arg=--import-memory",
     );
 
     let cargo_build = |manifest_path: &ManifestPath| {
@@ -940,8 +940,13 @@ mod tests_ci_only {
 
             // then
             assert!(res.is_err());
-            assert!(format!("{:?}", res)
-                .starts_with("Err(Your wasm-opt version is 98, but we require a version >= 99."));
+            assert!(
+                format!("{:?}", res).starts_with(
+                    "Err(Your wasm-opt version is 98, but we require a version >= 99."
+                ),
+                "Expected a different output, found {:?}",
+                res
+            );
 
             Ok(())
         })