diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 141b4a2c..00000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# shallow clone
-clone_depth: 5
-
-environment:
-  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      cmake_generator: "Visual Studio 15 2017 Win64"
-
-platform:
-  - x64
-
-configuration:
-  - Release
-
-install:
-  - git submodule update --init --recursive
-  - cd externals
-  - git clone https://github.com/MerryMage/ext-boost boost
-  - cd ..
-
-before_build:
-  - mkdir build
-  - cd build
-  - cmake .. -G "%cmake_generator%" -DBoost_INCLUDE_DIRS=%cd%/../externals/boost
-  - cd ..
-
-build:
-  project: build/dynarmic.sln
-  parallel: true
-
-test_script:
-  - cd build && ctest -VV -C Release && cd ..
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index ca74226e..921556bd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
         cpu_detection: [0, 1]
       fail-fast: false
 
@@ -37,16 +37,19 @@ jobs:
         path: externals/ext-boost
 
     - name: Checkout unicorn repo
+      if: ${{matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'}}
       uses: actions/checkout@v2
       with:
         repository: MerryMage/unicorn
         path: externals/unicorn
 
     - name: Build unicorn
+      if: ${{matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'}}
       working-directory: externals/unicorn
       run: UNICORN_ARCHS=aarch64,arm ./make.sh
 
     - name: Configure CMake
+      if: ${{matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'}}
       run: >
         cmake 
         -B ${{github.workspace}}/build
@@ -59,9 +62,20 @@ jobs:
         -DLIBUNICORN_LIBRARY=${{github.workspace}}/externals/unicorn/libunicorn.a
         -G Ninja
 
+    - name: Configure CMake
+      if: ${{matrix.os == 'windows-latest'}}
+      run: >
+        cmake
+        -B ${{github.workspace}}/build
+        -DBoost_INCLUDE_DIRS=${{github.workspace}}/externals/ext-boost
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=${{matrix.cpu_detection}}
+        -G "Visual Studio 16 2019"
+        -A x64
+
     - name: Build
       working-directory: ${{github.workspace}}/build
-      run: ninja
+      run: cmake --build . --config Release
 
     - name: Test
       env:
diff --git a/README.md b/README.md
index 1b0eafb2..f57bca93 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Dynarmic
 ========
 
-[![Github Actions Build Status](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml) [![Appveyor CI Build status](https://ci.appveyor.com/api/projects/status/maeiqr41rgm1innm/branch/master?svg=true)](https://ci.appveyor.com/project/MerryMage/dynarmic/branch/master)
+[![Github Actions Build Status](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml)
 
 A dynamic recompiler for ARM.