diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 854b239d6..ea049114e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -575,7 +575,7 @@ if(BUILD_TESTING)
     file(WRITE "${_TEST_DIR}/nightly-cmake.sh"
       "cd ${_TEST_DIR}
 ${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
-${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
+${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
     ")
     add_test(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
     if(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index 613d73dc8..5f4da8f0e 100644
--- a/Utilities/Release/upload_release.cmake
+++ b/Utilities/Release/upload_release.cmake
@@ -5,16 +5,15 @@ endif()
 if(NOT DEFINED PROJECT_PREFIX)
   set(PROJECT_PREFIX cmake-${VERSION})
 endif()
-set(dir "v${VERSION}")
-if("${VERSION}" MATCHES "master")
-  set(dir "dev")
+if(NOT DEFINED DIR)
+  set(DIR "v${VERSION}")
 endif()
 file(GLOB FILES ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_PREFIX}*")
 list(SORT FILES)
 list(REVERSE FILES)
 message("${FILES}")
 set(UPLOAD_LOC
-  "kitware@www.cmake.org:/projects/FTP/pub/cmake/${dir}")
+  "kitware@www.cmake.org:/projects/FTP/pub/cmake/${DIR}")
 set(count 0)
 foreach(file ${FILES})
   if(NOT IS_DIRECTORY ${file})