diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index 4f84b036b7dd0c6894242939cfdf45e806d31ba6..b11848661508e33817b762ee49674da3d85a2323 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -16,7 +16,7 @@ if(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
   set(CTEST_BUILD_CONFIGURATION "Debug")
 else(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
   set(CTEST_BUILD_CONFIGURATION "RelWithDebInfo")
-endif(NOT CTEST_BUILD_CONFIGURATION)
+endif(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 
 set(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/src/gmsh")
 set(CTEST_SVN_REPOS https://geuz.org/svn/gmsh/trunk)
@@ -35,8 +35,8 @@ if(CTEST_BUILD_OPTIONS_QUOTED)
   set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_BUILD_OPTIONS_QUOTED}\"")
 endif(CTEST_BUILD_OPTIONS_QUOTED)
 if(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
-  set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCMAKE_CXX_FLAGS:STRING=\"-g -O0 -fprofile-arcs -ftest-coverage\"")
-  set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCMAKE_C_FLAGS:STRING=\"-g -O0 -fprofile-arcs -ftest-coverage\"")
+  set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCMAKE_CXX_FLAGS:STRING=-g -O0 -fprofile-arcs -ftest-coverage")
+  set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCMAKE_C_FLAGS:STRING=-g -O0 -fprofile-arcs -ftest-coverage")
 endif(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
 
@@ -44,11 +44,9 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTO
 set($ENV{LC_MESSAGES} "en_US")
 
 # select Experimental dashboard if none is selected
-if(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
-  set(CDASH_MODEL "Coverage")
-else if(NOT CDASH_MODEL)
+if(NOT CDASH_MODEL)
   set(CDASH_MODEL "Experimental")
-endif(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
+endif(NOT CDASH_MODEL)
 
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 ctest_start(${CDASH_MODEL})