diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0191f1454c..6fa02dcd6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,8 +267,8 @@ IF(CMAKE_COMPILER_IS_GNUCC OR APPLE)
 
   # Coverage tests need to have optimization turned off.
   IF(ENABLE_COVERAGE_TESTS)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -g -O0 -coverage -fprofile-arcs -ftest-coverage")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs")
     MESSAGE(STATUS "Coverage Tests: On.")
   ENDIF()
 
diff --git a/ctest_scripts/ctest_mpicc.ctest b/ctest_scripts/ctest_mpicc.ctest
index 9bca2038d8..617ea49a22 100644
--- a/ctest_scripts/ctest_mpicc.ctest
+++ b/ctest_scripts/ctest_mpicc.ctest
@@ -10,7 +10,11 @@ SET(CTEST_SOURCE_DIRECTORY "..")
 SET(CTEST_BINARY_DIRECTORY ".")
 
 set(CDASH_TOKEN $ENV{CDASH_TOKEN})
-MESSAGE("Using cdash token: ${CDASH_TOKEN}")
+IF (CDASH_TOKEN)
+ MESSAGE("CDASH TOKEN FOUND")
+ELSE (CDASH_TOKEN)
+ MESSAGE("NO CDASH TOKEN FOUND")
+ENDIF (CDASH_TOKEN)
 
 
 SITE_NAME(local_site_name)
diff --git a/ctest_scripts/ctest_serial_coverage.ctest b/ctest_scripts/ctest_serial_coverage.ctest
index 522ca0b8c8..9b8f90a201 100644
--- a/ctest_scripts/ctest_serial_coverage.ctest
+++ b/ctest_scripts/ctest_serial_coverage.ctest
@@ -10,7 +10,11 @@ SET(CTEST_SOURCE_DIRECTORY "..")
 SET(CTEST_BINARY_DIRECTORY ".")
 
 set(CDASH_TOKEN $ENV{CDASH_TOKEN})
-MESSAGE("Using cdash token: ${CDASH_TOKEN}")
+IF (CDASH_TOKEN)
+ MESSAGE("CDASH TOKEN FOUND")
+ELSE (CDASH_TOKEN)
+ MESSAGE("NO CDASH TOKEN FOUND")
+ENDIF (CDASH_TOKEN)
 
 
 SITE_NAME(local_site_name)
diff --git a/ctest_scripts/ctest_serial_dap.ctest b/ctest_scripts/ctest_serial_dap.ctest
index 9ea3333459..80fe31264d 100644
--- a/ctest_scripts/ctest_serial_dap.ctest
+++ b/ctest_scripts/ctest_serial_dap.ctest
@@ -10,7 +10,11 @@ SET(CTEST_SOURCE_DIRECTORY "..")
 SET(CTEST_BINARY_DIRECTORY ".")
 
 set(CDASH_TOKEN $ENV{CDASH_TOKEN})
-MESSAGE("Using cdash token: ${CDASH_TOKEN}")
+IF (CDASH_TOKEN)
+ MESSAGE("CDASH TOKEN FOUND")
+ELSE (CDASH_TOKEN)
+ MESSAGE("NO CDASH TOKEN FOUND")
+ENDIF (CDASH_TOKEN)
 
 
 SITE_NAME(local_site_name)