diff --git a/src/test-go.bats b/src/test-go.bats
index 16d2346..d376548 100755
--- a/src/test-go.bats
+++ b/src/test-go.bats
@@ -226,6 +226,7 @@ testEnv() {
   export TARGETOS=darwin
   export TARGETARCH=amd64
   testEnv
+  unset TARGETOS
 }
 
 @test "darwin-arm64-env" {
@@ -235,6 +236,27 @@ testEnv() {
   unset TARGETOS
 }
 
+@test "windows-386-env" {
+  export TARGETOS=windows
+  export TARGETARCH=386
+  testEnv
+  unset TARGETOS
+}
+
+@test "windows-amd64-env" {
+  export TARGETOS=windows
+  export TARGETARCH=amd64
+  testEnv
+  unset TARGETOS
+}
+
+@test "windows-arm64-env" {
+  export TARGETOS=windows
+  export TARGETARCH=arm64
+  testEnv
+  unset TARGETOS
+}
+
 testHelloGO() {
   run xx-go build -o /tmp/a.out ./fixtures/hello.go
   assert_success
@@ -346,6 +368,35 @@ testHelloGO() {
   export TARGETARCH=amd64
   export TARGETOS=darwin
   testHelloGO
+  unset TARGETOS
+}
+
+@test "darwin-arm64-hellogo" {
+  export TARGETARCH=arm64
+  export TARGETOS=darwin
+  testHelloGO
+  unset TARGETOS
+}
+
+@test "windows-386-hellogo" {
+  export TARGETARCH=386
+  export TARGETOS=windows
+  testHelloGO
+  unset TARGETOS
+}
+
+@test "windows-amd64-hellogo" {
+  export TARGETARCH=amd64
+  export TARGETOS=windows
+  testHelloGO
+  unset TARGETOS
+}
+
+@test "windows-arm64-hellogo" {
+  export TARGETARCH=arm64
+  export TARGETOS=windows
+  testHelloGO
+  unset TARGETOS
 }
 
 testHelloCGO() {
diff --git a/src/test-verify.bats b/src/test-verify.bats
index 2f760d6..a9db217 100755
--- a/src/test-verify.bats
+++ b/src/test-verify.bats
@@ -121,6 +121,11 @@ load 'assert'
   run xx-verify /idontexist
   assert_failure
 
+  export XX_VERIFY_FILE_CMD_OUTPUT=": PE32+ executable (console) ARM64 (stripped to external PDB), for MS Windows"
+  export TARGETPLATFORM=windows/arm64
+  run xx-verify /idontexist
+  assert_success
+
   export XX_VERIFY_FILE_CMD_OUTPUT=": PE32+ executable (console) Aarch64 (stripped to external PDB), for MS Windows"
   export TARGETPLATFORM=windows/arm64
   run xx-verify /idontexist
diff --git a/src/xx-verify b/src/xx-verify
index f2cb977..1f8e8ca 100755
--- a/src/xx-verify
+++ b/src/xx-verify
@@ -153,7 +153,8 @@ for f in "$@"; do
           expArch="arm64"
           ;;
         "windows")
-          expArch="Aarch64"
+          expArch="ARM64"
+          expArchAlt="Aarch64"
           ;;
         *)
           expArch="ARM aarch64"