diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8f626e4..fdcc574 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -57,7 +57,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
         rust: [stable]
 
     env:
@@ -72,6 +72,7 @@ jobs:
       run: rustup component add rustfmt
     - name: Run interop tests
       run: ./tonic-interop/test.sh
+      shell: bash
     - name: Run interop tests with tls
       run: ./tonic-interop/test.sh --use_tls
-
+      shell: bash
diff --git a/tonic-interop/bin/client_darwin_amd64 b/tonic-interop/bin/client_darwin_amd64
index 9933b90..e41c77f 100755
Binary files a/tonic-interop/bin/client_darwin_amd64 and b/tonic-interop/bin/client_darwin_amd64 differ
diff --git a/tonic-interop/bin/client_linux_amd64 b/tonic-interop/bin/client_linux_amd64
index 7314933..e3b5644 100755
Binary files a/tonic-interop/bin/client_linux_amd64 and b/tonic-interop/bin/client_linux_amd64 differ
diff --git a/tonic-interop/bin/client_windows_amd64.exe b/tonic-interop/bin/client_windows_amd64.exe
new file mode 100755
index 0000000..4db1f49
Binary files /dev/null and b/tonic-interop/bin/client_windows_amd64.exe differ
diff --git a/tonic-interop/bin/server_darwin_amd64 b/tonic-interop/bin/server_darwin_amd64
index e276f09..3719e68 100755
Binary files a/tonic-interop/bin/server_darwin_amd64 and b/tonic-interop/bin/server_darwin_amd64 differ
diff --git a/tonic-interop/bin/server_linux_amd64 b/tonic-interop/bin/server_linux_amd64
index 975a6e9..1e5584a 100755
Binary files a/tonic-interop/bin/server_linux_amd64 and b/tonic-interop/bin/server_linux_amd64 differ
diff --git a/tonic-interop/bin/server_windows_amd64.exe b/tonic-interop/bin/server_windows_amd64.exe
new file mode 100755
index 0000000..b532bb9
Binary files /dev/null and b/tonic-interop/bin/server_windows_amd64.exe differ
diff --git a/tonic-interop/test.sh b/tonic-interop/test.sh
index 42f0c0b..82afdde 100755
--- a/tonic-interop/test.sh
+++ b/tonic-interop/test.sh
@@ -3,16 +3,19 @@
 set -eu
 set -o pipefail
 
+echo "Running for OS: ${OSTYPE}"
+
 case "$OSTYPE" in
-  darwin*)  OS="darwin" ;;
-  linux*)   OS="linux" ;;
+  darwin*)  OS="darwin"; EXT="" ;;
+  linux*)   OS="linux"; EXT="" ;;
+  msys*) OS="windows"; EXT=".exe" ;;
   *)        exit 2 ;;
 esac
 
 cargo build -p tonic-interop --bins
 
 ARG="${1:-""}"
-SERVER="tonic-interop/bin/server_${OS}_amd64"
+SERVER="tonic-interop/bin/server_${OS}_amd64${EXT}"
 
 # TLS_CA="tonic-interop/data/ca.pem"
 TLS_CRT="tonic-interop/data/server1.pem"