diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml
new file mode 100644
index 00000000..948ca644
--- /dev/null
+++ b/.github/workflows/vs2022.yml
@@ -0,0 +1,76 @@
+name: vs2022
+on:
+  push:
+    branches: [ master, development]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-windows-vs2019-stl:
+    name: Windows VS2019 Debug - STL
+    runs-on: [windows-2019]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Build
+      run: |
+        git fetch --tags
+        cmake -G "Visual Studio 17 2022" -AWin32 -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
+        MSBuild.exe -version
+        MSBuild.exe .\etl.sln
+        
+    - name: Run tests
+      run: test/Debug/etl_tests.exe
+
+  build-windows-vs2019-no-stl:
+    name: Windows VS2019 Debug - No STL
+    runs-on: [windows-2019]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Build
+      run: |
+        git fetch --tags
+        cmake -G "Visual Studio 17 2022" -AWin32 -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
+        MSBuild.exe -version
+        MSBuild.exe .\etl.sln
+        
+    - name: Run tests
+      run: test/Debug/etl_tests.exe
+
+  build-windows-vs2019-stl-force-cpp03:
+    name: Windows VS2019 Debug - STL - Force C++03
+    runs-on: [windows-2019]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Build
+      run: |
+        git fetch --tags
+        cmake -G "Visual Studio 17 2022" -AWin32 -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON ./
+        MSBuild.exe -version
+        MSBuild.exe .\etl.sln
+        
+    - name: Run tests
+      run: test/Debug/etl_tests.exe
+
diff --git a/appveyor.yml b/appveyor.yml
index dfcb4724..3ce5a354 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@ version: 1.0.{build}
 branches:
   only:
   - master
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration:
 - Debug
 - Debug - No STL
@@ -11,10 +11,8 @@ configuration:
 clone_folder: c:\projects\etl
 install:
 - cmd: git submodule update --init --recursive
-before_build:
-- cmd: git clone https://github.com/unittest-cpp/unittest-cpp.git c:\projects\unittest-cpp
 build:
-  project: test/vs2019/etl.vcxproj
+  project: test/vs2022/etl.vcxproj
   verbosity: minimal
 notifications:
 - provider: Webhook