diff --git a/.github/workflows/main.yml b/.github/workflows/linux.yml
similarity index 90%
rename from .github/workflows/main.yml
rename to .github/workflows/linux.yml
index e7758e1..b28a572 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/linux.yml
@@ -1,4 +1,4 @@
-name: Linux, MacOS
+name: Linux
 
 on:
   push:
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
         compiler: [g++, clang++]
         flags: [-std=c++11, -std=c++17]
         optimize: [-O2]
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 0000000..0a719e5
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,25 @@
+name: MacOS
+
+on:
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+        compiler: [g++, clang++]
+        flags: [-std=c++11, -std=c++17]
+        optimize: [-O2]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Build and test
+      env:
+        CXX: ${{ matrix.compiler }}
+        CXXFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }}
+      run: |
+        mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. && cmake --build . && make test
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000..4ad4a38
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,24 @@
+name: Windows
+
+on:
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest]
+        flags: [/std:c++11, /std:c++17]
+        optimize: [/O2]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Build and test
+      env:
+        CXX: ${{ matrix.compiler }}
+        CXXFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }}
+      run: |
+        mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. && cmake --build . && make test
diff --git a/README.md b/README.md
index 5ca0efc..8950080 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
 <img src="https://github.com/greg7mdp/parallel-hashmap/blob/master/html/img/phash.png?raw=true" width="120" align="middle"> 
 
-# The Parallel Hashmap  ![Linux/MacOS](https://github.com/greg7mdp/parallel-hashmap/actions/workflows/main.yml/badge.svg)  [![Build Status](https://ci.appveyor.com/api/projects/status/86kc657lp4cja8ju?svg=true)](https://ci.appveyor.com/project/greg7mdp/parallel-hashmap) 
+# The Parallel Hashmap  ![Linux](https://github.com/greg7mdp/parallel-hashmap/actions/workflows/linux.yml/badge.svg)  ![MacOS](https://github.com/greg7mdp/parallel-hashmap/actions/workflows/macos.yml/badge.svg) ![Windows](https://github.com/greg7mdp/parallel-hashmap/actions/workflows/windows.yml/badge.svg) 
 
 ## Overview