diff --git a/scripts/appveyor/av_default.cmake b/scripts/appveyor/av_default.cmake
index 81ad4fbbb1c51f6eb0649f3b939f0bdbe54afd2d..13dc0645b71ae1ed024c34c10b3a0ccde78fd8df 100644
--- a/scripts/appveyor/av_default.cmake
+++ b/scripts/appveyor/av_default.cmake
@@ -1,7 +1,6 @@
 # Client maintainer: chuck.atkins@kitware.com
 set(CTEST_SITE "AppVeyor")
 set(CTEST_BUILD_CONFIGURATION Release)
-set(CTEST_CONFIGURATION_TYPE Release)
 set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
 set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
 
diff --git a/scripts/dashboard/common.cmake b/scripts/dashboard/common.cmake
index ac88d93726957d9728a67b9e0b1d6f81f42a3d2a..aa3649705e5fc695c27f5e36340e0756e0a9bb42 100644
--- a/scripts/dashboard/common.cmake
+++ b/scripts/dashboard/common.cmake
@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
   message(FATAL_ERROR "dashboard_model must be Nightly or Experimental")
 endif()
 
-
 # Default to a Debug build.
 if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
   set(CTEST_BUILD_CONFIGURATION Debug)
 endif()
 
+if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION})
+endif()
+
 # Choose CTest reporting mode.
 if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   # Launchers work only with Makefile and Ninja generators.