diff --git a/utils/nightly/gmsh_linux.ctest b/utils/nightly/gmsh_linux.ctest
index ee1d6429891a7b29d38ea4a75a560df910232bc2..77bc6d120b5cc950db356ba16b3ac6d2a5eab40c 100644
--- a/utils/nightly/gmsh_linux.ctest
+++ b/utils/nightly/gmsh_linux.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
 set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Linux")
@@ -15,6 +14,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 
 #################################################################################
 set(CTEST_BUILD_NAME "Linux32")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local")
 set(OPT "${OPT} -DENABLE_NATIVE_FILE_CHOOSER:bool=FALSE")
diff --git a/utils/nightly/gmsh_linux64.ctest b/utils/nightly/gmsh_linux64.ctest
index 3c3654058f8775752fb569f280e4dac79ee98241..877684b6290373d79d1e9f1a292b30b4c25c29c5 100644
--- a/utils/nightly/gmsh_linux64.ctest
+++ b/utils/nightly/gmsh_linux64.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
 set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Linux")
@@ -16,8 +15,10 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 #################################################################################
 if(BUILD_DYNAMIC)
   set(CTEST_BUILD_NAME "Linux64-dynamic")
+  set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_dynamic")
 else(BUILD_DYNAMIC)
   set(CTEST_BUILD_NAME "Linux64")
+  set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 endif(BUILD_DYNAMIC)
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local")
diff --git a/utils/nightly/gmsh_linux64_coverage.ctest b/utils/nightly/gmsh_linux64_coverage.ctest
index 644ccc8cf4746108f7a8b71d73bf58c397e6c5db..c6b65ac6bef4f2d208fa52649bbbba8748ea24fe 100644
--- a/utils/nightly/gmsh_linux64_coverage.ctest
+++ b/utils/nightly/gmsh_linux64_coverage.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_coverage")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
 set(WITH_TEST TRUE)      # run the tests?
@@ -13,6 +12,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 
 #################################################################################
 set(CTEST_BUILD_NAME "Linux64-Coverage")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_coverage")
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DENABLE_FLTK=0")
 #set(OPT "${OPT} -DENABLE_NETGEN=0 -DENABLE_DINTEGRATION=0")
diff --git a/utils/nightly/gmsh_linux64_dynamic_nightly.ctest b/utils/nightly/gmsh_linux64_dynamic_nightly.ctest
deleted file mode 100644
index e05715aaf4502fb1aa9c0fd2493f18e6521b9644..0000000000000000000000000000000000000000
--- a/utils/nightly/gmsh_linux64_dynamic_nightly.ctest
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
-
-set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-dynamic-svn")
-set(BUILD_DYNAMIC true)
-include(gmsh_linux64.ctest)
diff --git a/utils/nightly/gmsh_linux64_nightly.cron b/utils/nightly/gmsh_linux64_nightly.cron
index afc0a9c09c960737437dc073e4ce205104ae1685..dd7473be1e22f9dc78721171f708843d6fabb15b 100644
--- a/utils/nightly/gmsh_linux64_nightly.cron
+++ b/utils/nightly/gmsh_linux64_nightly.cron
@@ -2,5 +2,3 @@
 # this will launch a new build every night at 1h01
 #
 1 1 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux64_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1
-1 2 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1
-1 3 * * * cd ${HOME}/src/gmsh/utils/nightly && /usr/bin/ctest -S gmsh_linux64_coverage.ctest -VV > ${HOME}/src/gmsh/nightly_coverage.log 2>&1
diff --git a/utils/nightly/gmsh_linux64_nightly.ctest b/utils/nightly/gmsh_linux64_nightly.ctest
index 647dd30a8125a2a0b62532e5988c1219b713630c..8a92ad6ff2ee901f812241860c24f0b1e7c4cc99 100644
--- a/utils/nightly/gmsh_linux64_nightly.ctest
+++ b/utils/nightly/gmsh_linux64_nightly.ctest
@@ -7,3 +7,10 @@ set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
 set(EXTRA_VERSION "-svn")
 include(gmsh_linux64.ctest)
+
+set(EXTRA_VERSION "-dynamic-svn")
+set(BUILD_DYNAMIC true)
+include(gmsh_linux64.ctest)
+
+set(EXTRA_VERSION "-coverage-svn")
+include(gmsh_linux64_coverage.ctest)
diff --git a/utils/nightly/gmsh_mac.ctest b/utils/nightly/gmsh_mac.ctest
index 7d9db85f51e0a8a226890e78a2070371cae8a00f..7279e8f43620dc67b9975bef81a710fdcc4860a9 100644
--- a/utils/nightly/gmsh_mac.ctest
+++ b/utils/nightly/gmsh_mac.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "/usr/local/bin/cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
 set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/MacOSX")
@@ -16,8 +15,10 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 #################################################################################
 if(BUILD_DYNAMIC)
   set(CTEST_BUILD_NAME "MacOSX64-dynamic")
+  set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_dynamic")
 else(BUILD_DYNAMIC)
   set(CTEST_BUILD_NAME "MacOSX64")
+  set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 endif(BUILD_DYNAMIC)
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local")
diff --git a/utils/nightly/gmsh_mac_dynamic_nightly.ctest b/utils/nightly/gmsh_mac_dynamic_nightly.ctest
deleted file mode 100644
index efb6530cd9cd22c42063360b172a155c4c568fb0..0000000000000000000000000000000000000000
--- a/utils/nightly/gmsh_mac_dynamic_nightly.ctest
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
-
-set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-dynamic-svn")
-set(BUILD_DYNAMIC true)
-include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_mac_nightly.ctest b/utils/nightly/gmsh_mac_nightly.ctest
index 18910e64040cc3de33022e57f3aba93b0d8b29ff..b49988ac97afe5451c1868cf71d08d1e86e9560f 100644
--- a/utils/nightly/gmsh_mac_nightly.ctest
+++ b/utils/nightly/gmsh_mac_nightly.ctest
@@ -7,3 +7,7 @@ set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
 set(EXTRA_VERSION "-svn")
 include(gmsh_mac.ctest)
+
+set(EXTRA_VERSION "-dynamic-svn")
+set(BUILD_DYNAMIC true)
+include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_mac_nightly.sh b/utils/nightly/gmsh_mac_nightly.sh
index 6c6bc3f9f8336c2dc822b7124290f22807959c61..032f0b9dd654edbc086c312c5e622f67c248e58b 100755
--- a/utils/nightly/gmsh_mac_nightly.sh
+++ b/utils/nightly/gmsh_mac_nightly.sh
@@ -5,4 +5,3 @@
 #  * launchctl load ~/Library/LaunchAgents/org.geuz.gmsh.nightly.plist
 
 cd ${HOME}/src/gmsh/utils/nightly && /usr/local/bin/ctest -S gmsh_mac_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1
-cd ${HOME}/src/gmsh/utils/nightly && /usr/local/bin/ctest -S gmsh_mac_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1
diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest
index cda303e8d4e153b4949e15a93355235ba4452782..a7ca84799bf484aa96282015ad6fa8611e63df36 100644
--- a/utils/nightly/gmsh_msvc.ctest
+++ b/utils/nightly/gmsh_msvc.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "C:/Program Files (x86)/CMake 2.8/bin/cmake.exe")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc")
 set(CTEST_CMAKE_GENERATOR "Visual Studio 11")
 
 set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows")
@@ -15,6 +14,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 
 #################################################################################
 set(CTEST_BUILD_NAME "Win64-msvc-mkl")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc")
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DENABLE_FLTK=0")
 set(CTEST_BUILD_OPTIONS "${OPT}")
diff --git a/utils/nightly/gmsh_win.ctest b/utils/nightly/gmsh_win.ctest
index b6dc1eeb3378e0397afa8035bf0a0ffcf717a2cf..504b7204d6a71e5c59c0bdeb13fecaea445458ce 100644
--- a/utils/nightly/gmsh_win.ctest
+++ b/utils/nightly/gmsh_win.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
 set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows")
@@ -24,6 +23,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 
 #################################################################################
 set(CTEST_BUILD_NAME "Win32")
+set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local;/usr/i686-w64-mingw32/sys-root/mingw")
 set(OPT "${OPT} -DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc.exe")
diff --git a/utils/nightly/gmsh_win64.ctest b/utils/nightly/gmsh_win64.ctest
index 86c684fa7f8bb86a11b4a6d8d36d5a90b21c59ab..fef6748d537526cf708fdbfbd9c7b86a8b6b556f 100644
--- a/utils/nightly/gmsh_win64.ctest
+++ b/utils/nightly/gmsh_win64.ctest
@@ -4,7 +4,6 @@
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
 set(CTEST_CMAKE_COMMAND "cmake")
-set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
 set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows")
@@ -16,8 +15,10 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 #################################################################################
 if(BUILD_DYNAMIC)
   set(CTEST_BUILD_NAME "Win64-dynamic")
+  set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_dynamic")
 else(BUILD_DYNAMIC)
   set(CTEST_BUILD_NAME "Win64")
+  set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin")
 endif(BUILD_DYNAMIC)
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
 set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local;/usr/x86_64-w64-mingw32/sys-root/mingw")
diff --git a/utils/nightly/gmsh_win64_dynamic_nightly.ctest b/utils/nightly/gmsh_win64_dynamic_nightly.ctest
deleted file mode 100644
index 147a06b296433a6bcb536edfa728ee7c09bdccec..0000000000000000000000000000000000000000
--- a/utils/nightly/gmsh_win64_dynamic_nightly.ctest
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
-#
-# See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
-
-set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(CDASH_MODEL "Nightly")
-set(EXTRA_VERSION "-dynamic-svn")
-set(BUILD_DYNAMIC true)
-include(gmsh_win64.ctest)
diff --git a/utils/nightly/gmsh_win64_nightly.bat b/utils/nightly/gmsh_win64_nightly.bat
index 6e780c6b403256865ca9c27a0c6323c5c7b1187a..c7fd8ca4558214260f76e7410ad7c1f6ba04e62b 100755
--- a/utils/nightly/gmsh_win64_nightly.bat
+++ b/utils/nightly/gmsh_win64_nightly.bat
@@ -5,6 +5,4 @@ chdir C:\cygwin\bin
 
 bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1"
 
-bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1"
-
 bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && /cygdrive/c/Program\ Files\ \(x86\)/CMake\ 2.8/bin/ctest.exe -S gmsh_msvc.ctest -VV > ${HOME}/src/gmsh/nightly_msvc.log 2>&1"
diff --git a/utils/nightly/gmsh_win64_nightly.ctest b/utils/nightly/gmsh_win64_nightly.ctest
index 7a4207f5ada3ceb424277dfcdbff5627e77c7934..14ed8d107d999a527a050d8d921eb00e1c9c2ab3 100644
--- a/utils/nightly/gmsh_win64_nightly.ctest
+++ b/utils/nightly/gmsh_win64_nightly.ctest
@@ -7,3 +7,7 @@ set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
 set(EXTRA_VERSION "-svn")
 include(gmsh_win64.ctest)
+
+set(EXTRA_VERSION "-dynamic-svn")
+set(BUILD_DYNAMIC true)
+include(gmsh_win64.ctest)