diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 8fb54aa..a83f1d7 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -24,3 +24,30 @@ jobs:
       run: |
         cd cppcheck
         ./run.sh
+
+  cppcheck-windows:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Install cppcheck
+      run: choco install cppcheck
+
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Setup cmake
+      uses: lukka/get-cmake@latest
+
+    - name: cmake p2pool
+      run: |
+        mkdir build
+        cd build
+        cmake .. -G "Visual Studio 16 2019"
+
+    - name: Run cppcheck
+      run: |
+        cd cppcheck
+        ./run.cmd
diff --git a/cppcheck/run.cmd b/cppcheck/run.cmd
index 892c467..362c1bf 100644
--- a/cppcheck/run.cmd
+++ b/cppcheck/run.cmd
@@ -1,3 +1,8 @@
 @echo off
 "C:\Program Files\cppcheck\cppcheck.exe" --project=..\build\p2pool.vcxproj --project-configuration="Release|x64" -DZMQ_STATIC --platform=win64 --std=c++14 --enable=all --inconclusive --inline-suppr --template="{file}:{line}:{id}{inconclusive: INCONCLUSIVE} {message}" --includes-file=includes.txt --suppressions-list=suppressions.txt --output-file=errors_full.txt
 findstr /V /C:"external\src" errors_full.txt > errors_filtered.txt
+for /f %%i in ("errors_filtered.txt") do set size=%%~zi
+if %size% gtr 0 (
+	type errors_filtered.txt
+	exit 1
+)