diff --git a/msvc/output_params.bat b/msvc/output_params.bat
deleted file mode 100644
index 6f97afb6..00000000
--- a/msvc/output_params.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-(set ldir=lib_mpir_skylake_avx\)   
-(set libr=lib) 
-(set plat=x64) 
-(set conf=Release) 
diff --git a/msvc/vs17/msbuild.bat b/msvc/vs17/msbuild.bat
index 35a0497b..0d22b2c1 100644
--- a/msvc/vs17/msbuild.bat
+++ b/msvc/vs17/msbuild.bat
@@ -3,7 +3,8 @@ rem %1 = architecture
 rem %2 = library type (LIB|DLL)
 rem %3 = platform (Win32|x64)
 rem %4 = configuration (Release|Debug)
-rem %5 = build tests (|+tests)
+rem %5 = Windows SDK Version
+rem %6 = build tests (|+tests)
 
 set vsw_exe="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 
@@ -28,6 +29,7 @@ if not exist "lib_mpir_%1" (call :get_architectures & call :seterr & echo ERROR:
 if /i "%2" EQU "DLL" (set libp=dll) else (if /i "%2" EQU "LIB" (set libp=lib) else ((call :seterr & echo ERROR: library type is "lib" or "dll" ^(not "%2"^) & exit /b %errorlevel%)))
 if /i "%3" EQU "x64" (set plat=x64) else (if /i "%3" EQU "Win32" (set plat=win32) else (call :seterr & echo ERROR: platform is "Win32" or "x64" ^(not "%3"^) & exit /b %errorlevel%))
 if /i "%4" EQU "Debug" (set conf=Debug) else (if /i "%4" EQU "Release" (set conf=Release) else (call :seterr & echo ERROR: configuration is "Release" or "Debug" ^(not "%4"^) & exit /b %errorlevel%))
+if "%5" NEQ "" (set win_sdk="%5")
 
 set src=%libp%_mpir_%1
 
@@ -35,16 +37,16 @@ rem This is the Visual Studio build directory (within the MPIR directory)
 set srcdir="."
 
 echo Using MSBuild at: %msbdir%
-%msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% %srcdir%\%src%\%src%.vcxproj
+%msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\%src%\%src%.vcxproj
 
 if /i "%libp%" == "LIB" (
-  %msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% %srcdir%\lib_mpir_cxx\lib_mpir_cxx.vcxproj
+  %msbdir%\msbuild.exe /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %srcdir%\lib_mpir_cxx\lib_mpir_cxx.vcxproj
 )
 
-if /i "%5" EQU "+tests" (
+if /i "%6" EQU "+tests" (
   for /d %%d in (.\mpir-tests\*) do (
     for %%f in (%%d\*.vcxproj) do (
-      %msbdir%\msbuild.exe /property:SolutionDir=..\..\ /property:OutDir=..\..\%plat%\%conf%\ /p:Platform=%plat% /p:Configuration=%conf% %%f
+      %msbdir%\msbuild.exe /property:SolutionDir=..\..\ /property:OutDir=..\..\%plat%\%conf%\ /p:Platform=%plat% /p:Configuration=%conf% /p:"Windows%20SDK%20Version=%win_sdk%" %%f
     )
   )
 )
diff --git a/msvc/vs17/test-config.props b/msvc/vs17/test-config.props
deleted file mode 100644
index 0e21ade8..00000000
--- a/msvc/vs17/test-config.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
-  <PropertyGroup Label="UserMacros"> 
-    <MPDIR>..\..\lib_mpir_skylake_avx\x64\Release\</MPDIR> 
-    <MPLIBS>..\..\lib_mpir_skylake_avx\x64\Release\mpir.lib;..\..\lib_mpir_cxx\x64\Release\mpirxx.lib</MPLIBS> 
-  </PropertyGroup> 
-  <ItemDefinitionGroup> 
-    <ClCompile> 
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 
-      <AdditionalIncludeDirectories>$(MPDIR);$(SolutionDir)..\..\tests</AdditionalIncludeDirectories> 
-    </ClCompile> 
-    <Link> 
-      <AdditionalDependencies>$(MPLIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies> 
-    </Link> 
-  </ItemDefinitionGroup> 
-  <ItemGroup> 
-    <BuildMacro Include="MPDIR"> 
-      <Value>$(MPDIR)</Value> 
-      <EnvironmentVariable>true</EnvironmentVariable> 
-    </BuildMacro> 
-    <BuildMacro Include="MPLIBS"> 
-      <Value>$(MPLIBS)</Value> 
-      <EnvironmentVariable>true</EnvironmentVariable> 
-    </BuildMacro> 
-  </ItemGroup> 
-</Project>