diff --git a/appveyor.yml b/appveyor.yml
index 22ea4e4e4751d3c2e519461755762af6d9a9c8d9..af43c06d06443fd42e18197446852b4125f55354 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,23 +28,24 @@ before_build:
         $env:BUILD_NAME_BRANCH = $env:APPVEYOR_REPO_BRANCH
     }
     $env:CUSTOM_BUILD_NAME = ("{0}_{1}_vs{2}" -f $env:BUILD_NAME_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE.split()[2] )
-- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
+    $env:DASHBOARD_SCRIPT_SUFFIX = ($ENV:APPVEYOR_BUILD_WORKER_IMAGE -replace '\s', '-').ToLower()
+- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
     -Ddashboard_full=OFF
     -Ddashboard_do_update=true
     -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
 
 build_script:
-- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
+- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
     -Ddashboard_full=OFF
     -Ddashboard_do_configure=true
     -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
-- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
+- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
     -Ddashboard_full=OFF
     -Ddashboard_do_build=true
     -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
 
 test_script:
-- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
+- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
     -Ddashboard_full=OFF
     -Ddashboard_do_test=true
     -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
diff --git a/scripts/appveyor/av_default.cmake b/scripts/appveyor/av_visual-studio-2015.cmake
similarity index 85%
rename from scripts/appveyor/av_default.cmake
rename to scripts/appveyor/av_visual-studio-2015.cmake
index 13dc0645b71ae1ed024c34c10b3a0ccde78fd8df..06f031d2815f3de9a51aff5eaca911ad28ad52b9 100644
--- a/scripts/appveyor/av_default.cmake
+++ b/scripts/appveyor/av_visual-studio-2015.cmake
@@ -4,7 +4,7 @@ set(CTEST_BUILD_CONFIGURATION Release)
 set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
 set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
 
-message("av_default.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")
+message("av_visual-studio-2015.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")
 
 set(dashboard_model Experimental)
 set(dashboard_binary_name "build_visual-studio")
diff --git a/scripts/appveyor/av_visual-studio-2017.cmake b/scripts/appveyor/av_visual-studio-2017.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..a02fc4ed92d648d68916b3137f65c661bddd35d8
--- /dev/null
+++ b/scripts/appveyor/av_visual-studio-2017.cmake
@@ -0,0 +1,30 @@
+# Client maintainer: chuck.atkins@kitware.com
+set(CTEST_SITE "AppVeyor")
+set(CTEST_BUILD_CONFIGURATION Release)
+set(CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
+set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
+
+message("av_visual-studio-2017.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")
+
+set(dashboard_model Experimental)
+set(dashboard_binary_name "build_visual-studio")
+set(dashboard_track "Continuous Integration")
+
+set(CTEST_GIT_COMMAND "git.exe")
+set(CTEST_UPDATE_VERSION_ONLY TRUE)
+set(CTEST_SOURCE_DIRECTORY "$ENV{APPVEYOR_BUILD_FOLDER}")
+set(CTEST_DASHBOARD_ROOT "C:/projects/adios2build")
+
+set(dashboard_cache "
+ADIOS2_USE_ADIOS1:STRING=OFF
+ADIOS2_USE_BZip2:STRING=OFF
+ADIOS2_USE_DataMan:STRING=OFF
+ADIOS2_USE_Fortran:STRING=OFF
+ADIOS2_USE_HDF5:STRING=OFF
+ADIOS2_USE_MPI:STRING=OFF
+ADIOS2_USE_Python:STRING=OFF
+ADIOS2_USE_ZFP:STRING=OFF
+ADIOS2_USE_ZeroMQ:STRING=OFF
+")
+
+include(${CMAKE_CURRENT_LIST_DIR}/../dashboard/adios_common.cmake)