diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 76ea5b48a..8a256bf19 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -684,14 +684,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     endif()
   endmacro()
   if(CMAKE_BUILD_NIGHTLY_RELEASES)
-    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
-      dash3win7_release.cmake)
+    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32
+      win32_release.cmake)
+    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin64
+      win64_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
-      bigmac_release.cmake)
+      osx_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
-      magrathea_release.cmake)
+      linux32_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
       linux64_release.cmake)
+    set_property(TEST CMakeNightlyWin64 PROPERTY DEPENDS CMakeNightlyWin32)
   endif()
 
   # add tests with more complex invocations
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 403367bf7..f8844e9ef 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -6,14 +6,15 @@ endif()
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
 
 set(RELEASE_SCRIPTS_BATCH_1
-  dash3win7_release.cmake     # Windows
-  bigmac_release.cmake        # OS X x86_64
-  magrathea_release.cmake     # Linux
+  win32_release.cmake         # Windows x86
+  osx_release.cmake           # OS X x86_64
+  linux32_release.cmake       # Linux x86
   linux64_release.cmake       # Linux x86_64
 )
 
 set(RELEASE_SCRIPTS_BATCH_2
-  dash2win64_cygwin.cmake     # Cygwin
+  cygwin_release.cmake        # Cygwin x86
+  win64_release.cmake         # Windows x64
 )
 
 function(write_batch_shell_script filename)
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/cygwin_release.cmake
similarity index 97%
rename from Utilities/Release/dash2win64_cygwin.cmake
rename to Utilities/Release/cygwin_release.cmake
index ca590ed1f..ca3e794b9 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/cygwin_release.cmake
@@ -17,7 +17,6 @@ CMake_INSTALL_DEPENDENCIES:BOOL=ON
 ")
 set(CXX g++)
 set(CC  gcc)
-set(SCRIPT_NAME dash2win64cygwin)
 set(GIT_EXTRA "git config core.autocrlf false")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/linux32_release.cmake
similarity index 100%
rename from Utilities/Release/magrathea_release.cmake
rename to Utilities/Release/linux32_release.cmake
diff --git a/Utilities/Release/bigmac_release.cmake b/Utilities/Release/osx_release.cmake
similarity index 100%
rename from Utilities/Release/bigmac_release.cmake
rename to Utilities/Release/osx_release.cmake
diff --git a/Utilities/Release/dash3win7_release.cmake b/Utilities/Release/win32_release.cmake
similarity index 88%
rename from Utilities/Release/dash3win7_release.cmake
rename to Utilities/Release/win32_release.cmake
index f25d63897..1d3ec8608 100644
--- a/Utilities/Release/dash3win7_release.cmake
+++ b/Utilities/Release/win32_release.cmake
@@ -25,4 +25,8 @@ set(CXXFLAGS "${ppflags}")
 set(ENV ". ~/rel/env")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(GIT_EXTRA "git config core.autocrlf true")
+if(CMAKE_CREATE_VERSION STREQUAL "nightly")
+  # Some tests fail spuriously too often.
+  set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
+endif()
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
new file mode 100644
index 000000000..cc1f37fad
--- /dev/null
+++ b/Utilities/Release/win64_release.cmake
@@ -0,0 +1,29 @@
+set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory64")
+set(CONFIGURE_WITH_CMAKE TRUE)
+set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe")
+set(PROCESSORS 8)
+set(HOST dash3win7)
+set(SCRIPT_NAME dash3win7x64)
+set(RUN_LAUNCHER ~/rel/run)
+set(CPACK_BINARY_GENERATORS "WIX ZIP")
+set(CPACK_SOURCE_GENERATORS "")
+set(MAKE_PROGRAM "ninja")
+set(MAKE "${MAKE_PROGRAM} -j8")
+set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:STRING=doc/cmake
+CMAKE_USE_OPENSSL:BOOL=OFF
+CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
+CMAKE_Fortran_COMPILER:FILEPATH=FALSE
+CMAKE_GENERATOR:INTERNAL=Ninja
+BUILD_QtDialog:BOOL:=TRUE
+CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
+CMake_INSTALL_DEPENDENCIES:BOOL=ON
+CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,5.02
+")
+set(ppflags "-D_WIN32_WINNT=0x502 -D_USING_V110_SDK71_")
+set(CFLAGS "${ppflags}")
+set(CXXFLAGS "${ppflags}")
+set(ENV ". ~/rel/env64")
+get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(GIT_EXTRA "git config core.autocrlf true")
+include(${path}/release_cmake.cmake)