diff --git a/.appveyor.yml b/.appveyor.yml
index 3e9a428..aa60ef7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -72,19 +72,21 @@ environment:
   VV: 1
 
   matrix:
-  - CMP: vs2019
+  - CMP: vs2022
     SET: test00
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
   - CMP: gcc
-  - CMP: vs2019
+  - CMP: vs2022
     VV: 0
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+  - CMP: vs2022
     BASE: 3.15
     CLEAN_DEPS: NO
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+  - CMP: vs2022
     BASE: 3.14
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+  - CMP: vs2019
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
   - CMP: vs2017
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index cf39cbb..a8c3757 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
+        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2022, windows-2019, windows-2016, macos-10.15]
     steps:
     - uses: actions/checkout@v2
     - name: Show initial environment
@@ -113,12 +113,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2016]
-        cmp: [gcc, vs2019, vs2017]
+        os: [windows-2022, windows-2019, windows-2016]
+        cmp: [gcc, vs2022, vs2019, vs2017]
         configuration: [default, static, debug, static-debug]
         exclude:
+          - os: windows-2022
+            cmp: vs2019
+          - os: windows-2022
+            cmp: vs2017
+
+          - os: windows-2019
+            cmp: vs2022
           - os: windows-2019
             cmp: vs2017
+
+          - os: windows-2016
+            cmp: vs2022
           - os: windows-2016
             cmp: vs2019
     steps:
diff --git a/cue-test.py b/cue-test.py
index f45963b..6e08ac0 100644
--- a/cue-test.py
+++ b/cue-test.py
@@ -349,8 +349,10 @@ class TestVCVars(unittest.TestCase):
             os.environ['CONFIGURATION'] = 'default'
             if ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win16':
                 os.environ['CMP'] = 'vs2017'
-            else:
+            elif ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win19':
                 os.environ['CMP'] = 'vs2019'
+            else:
+                os.environ['CMP'] = 'vs2022'
         cue.detect_context()
         cue.with_vcvars('env')
 
diff --git a/cue.py b/cue.py
index 474b170..c1c1f91 100644
--- a/cue.py
+++ b/cue.py
@@ -266,6 +266,8 @@ toolsdir = os.path.join(homedir, '.tools')
 
 vcvars_table = {
     # https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History
+    'vs2022': [r'C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat',
+               r'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'],
     'vs2019': [r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat',
                r'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'],
     'vs2017': [r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat',