Index: appveyor.yml
===================================================================
diff -u -rf718572e43e377ef7825ecea62fb47aab0cfed37 -rd78609dbfd42e17b4403758fa41c3c5dbe9de124
--- appveyor.yml	(.../appveyor.yml)	(revision f718572e43e377ef7825ecea62fb47aab0cfed37)
+++ appveyor.yml	(.../appveyor.yml)	(revision d78609dbfd42e17b4403758fa41c3c5dbe9de124)
@@ -15,8 +15,15 @@
   - TCLTAG: core-8-5-19
   - TCLTAG: core-8-7-a1	
   - TCLTAG: core-8-branch
+  - TOOLCHAIN: autoconf-tea
+  - TOOLCHAIN: nmake-tea
 
 matrix:
+  exclude:
+  - TOOLCHAIN: nmake-tea TCLTAG: core-8-5-19
+  - TOOLCHAIN: nmake-tea TCLTAG: core-8-5-branch
+  - TOOLCHAIN: nmake-tea TCLTAG: core-8-7-a1
+  - TOOLCHAIN: nmake-tea TCLTAG: core-8-branch
   allow_failures:
   - TCLTAG: core-8-6-branch
   - TCLTAG: core-8-5-branch
@@ -29,12 +36,13 @@
   - appveyor DownloadFile "%TCLKIT_URL%" -FileName "%TCLKIT%"
 
 build_script:
-  - set CHERE_INVOKING=1
-  - set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
+  - if "%TOOLCHAIN%" == "autoconf-tea" set CHERE_INVOKING=1
+  - if "%TOOLCHAIN%" == "autoconf-tea" set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
   # Needed to align MSYS and Windows HOME dirs
-  - set HOME=C:\Users\appveyor
-  - bash -lc "cd && echo \"export PATH=/c/msys64/mingw64/bin:/c/msys64/usr/bin:\$PATH; export MSYSTEM=MINGW64; export MINGW_PREFIX=/c/msys64/mingw64; \" >> .profile"
-  - tclkit.exe apps/build.tcl %CD% %APPVEYOR_BUILD_FOLDER% %TCLTAG%
+  - if "%TOOLCHAIN%" == "autoconf-tea" set HOME=C:\Users\appveyor
+  - if "%TOOLCHAIN%" == "autoconf-tea" bash -lc "cd && echo \"export PATH=/c/msys64/mingw64/bin:/c/msys64/usr/bin:\$PATH; export MSYSTEM=MINGW64; export MINGW_PREFIX=/c/msys64/mingw64; \" >> .profile"
+  - if "%TOOLCHAIN%" == "nmake-tea" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - tclkit.exe apps/build.tcl %CD% %APPVEYOR_BUILD_FOLDER% %TCLTAG% %TOOLCHAIN%
 
 on_failure:
-  - cat tcl\win\config.log
\ No newline at end of file
+  - if "%TOOLCHAIN%" == "autoconf-tea" cat tcl\win\config.log
\ No newline at end of file