diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 14128903..4976aa66 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,8 +60,29 @@ jobs:
         flag-name: ${{ matrix.os }}-${{ matrix.node }}
         parallel: true
 
+  test-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [16]
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node }}
+    - name: Test with MSVC
+      shell: bash
+      run: ./scripts/test-packaging.sh
+      env:
+        CMAKE_BUILD_PARALLEL_LEVEL: '4'
+
   test-finish:
-    needs: test
+    needs:
+      - test
+      - test-windows
     runs-on: ubuntu-latest
     steps:
     - name: Upload to Coveralls
diff --git a/.gitmodules b/.gitmodules
index a4f47344..82f9492d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "jsonnet"]
 	path = third_party/jsonnet
-	url = https://github.com/google/jsonnet
+	url = https://github.com/hanazuki/jsonnet
+  branch = windows-cmake
diff --git a/third_party/jsonnet b/third_party/jsonnet
index ed11b012..1229e40c 160000
--- a/third_party/jsonnet
+++ b/third_party/jsonnet
@@ -1 +1 @@
-Subproject commit ed11b012a4e1487727c595380bff8866d40f2529
+Subproject commit 1229e40c6fd7c057d9e9c4e85ca483a47a2e7d36