diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 37b86ab..88f7664 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -22,11 +22,13 @@ jobs:
       CMP: ${{ matrix.cmp }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15]
+        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
         cmp: [gcc]
         include:
           - cmp: vs2019
             os: windows-2019
+          - cmp: vs2017
+            os: windows-2016
 
     steps:
     - uses: actions/checkout@v2
@@ -44,7 +46,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-16.04, windows-2019, macos-10.15]
+        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/cue-test.py b/cue-test.py
index 5cd10aa..b431e81 100644
--- a/cue-test.py
+++ b/cue-test.py
@@ -335,7 +335,10 @@ class TestVCVars(unittest.TestCase):
             os.environ['TRAVIS_COMPILER'] = 'vs2017'
         else:
             os.environ['CONFIGURATION'] = 'default'
-            os.environ['CMP'] = 'vs2019'
+            if ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win16':
+                os.environ['CMP'] = 'vs2017'
+            else:
+                os.environ['CMP'] = 'vs2019'
         cue.detect_context()
         cue.with_vcvars('env')
 
diff --git a/cue.py b/cue.py
index 3a15cde..c800576 100644
--- a/cue.py
+++ b/cue.py
@@ -208,6 +208,7 @@ vcvars_table = {
     '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',
+               r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat',
                r'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat'],
     'vs2015': [r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'],
     'vs2013': [r'C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat'],