diff --git a/CMake/variants/variants b/CMake/variants/variants
index 385114f6ad223d34cb2d5408ca125eef1f221746..3e159a7bf1929e003d0f68ab2be9e56ebd34ef74 100644
--- a/CMake/variants/variants
+++ b/CMake/variants/variants
@@ -34,3 +34,6 @@ option(USE_OPENMP               "Use OpenMP"                  OFF)
 option(USE_SHMEM                "Use shmem"                   ON)
 option(USE_SOCKETS              "Use Sockets"                 ON)
 option(USE_THREADS              "Use threads"                 ON)
+
+# Override defaults for some of the settings for CTest/CDash.
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 200)
diff --git a/CMake/variants/variants.kis001 b/CMake/variants/variants.kis001
index bdd434ff7d5f7a96bec3e08deef03a477a82ab69..9270be62f22fe434daff2e35b81a71991b76380f 100644
--- a/CMake/variants/variants.kis001
+++ b/CMake/variants/variants.kis001
@@ -1,2 +1,8 @@
 set(PVSS_ROOT_DIR /opt/pvss/pvss2_v3.7)
-set(PVSS_DEFINITIONS "-Wno-deprecated -Wno-extra -Wno-overloaded-virtual")
+set(PVSS_DEFINITIONS "-Wno-deprecated")
+
+set(CTEST_CUSTOM_WARNING_EXCEPTION 
+  "/boost/date_time/time_facet.hpp:[0-9]+: warning: unused parameter"
+  "/boost/date_time/time.hpp:[0-9]+: warning: unused parameter"
+  "/pvss2_v3.7/api/include/(Basics|Datapoint|Manager|Messages)/"
+)
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index e00453665d58a42c890c4e505eaf8ec616a86043..3e087b01f5e7a4458f53178754386b6befc2dfbc 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -1,47 +1,53 @@
 # - CTest custom settings.
 # See http://www.cmake.org/Wiki/CMake_Testing_With_CTest for details.
+#
+# This file will be configured by LofarConfig.cmake; its output will be stored
+# in the top-level build directory. Any of the variables below can be set by
+# the user, either on the command line or in the variants file(s).
+
+# $Id$
 
 # Regular expression for errors during build process
-set(CTEST_CUSTOM_ERROR_MATCH)
+set(CTEST_CUSTOM_ERROR_MATCH "@CTEST_CUSTOM_ERROR_MATCH@")
 
 # Regular expression for error exceptions during build process
-set(CTEST_CUSTOM_ERROR_EXCEPTION)
+set(CTEST_CUSTOM_ERROR_EXCEPTION "@CTEST_CUSTOM_ERROR_EXCEPTION@")
 
 # Regular expression for warnings during build process
-set(CTEST_CUSTOM_WARNING_MATCH)
+set(CTEST_CUSTOM_WARNING_MATCH "@CTEST_CUSTOM_WARNING_MATCH@")
 
 # Regular expression for warning exception during build process
-set(CTEST_CUSTOM_WARNING_EXCEPTION)
+set(CTEST_CUSTOM_WARNING_EXCEPTION "@CTEST_CUSTOM_WARNING_EXCEPTION@")
 
 # Maximum number of errors to display
-set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS)
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS "@CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS@")
 
 # Maximum number of warnings to display
-set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 200)
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS "@CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS@")
 
 # List of tests to ignore during the Test stage
-set(CTEST_CUSTOM_TESTS_IGNORE)
+set(CTEST_CUSTOM_TESTS_IGNORE "@CTEST_CUSTOM_TESTS_IGNORE@")
 
 # List of tests to ignore during the MemCheck stage
-set(CTEST_CUSTOM_MEMCHECK_IGNORE)
+set(CTEST_CUSTOM_MEMCHECK_IGNORE "@CTEST_CUSTOM_MEMCHECK_IGNORE@")
 
 # Command to execute before any tests are run during Test stage
-set(CTEST_CUSTOM_PRE_TEST)
+set(CTEST_CUSTOM_PRE_TEST "@CTEST_CUSTOM_PRE_TEST@")
 
 # Command to execute after any tests are run during Test stage
-set(CTEST_CUSTOM_POST_TEST)
+set(CTEST_CUSTOM_POST_TEST "@CTEST_CUSTOM_POST_TEST@")
 
 # Maximum size of passed test output
-set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE)
+set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "@CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE@")
 
 # Maximum size of failed test output
-set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE)
+set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "@CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE@")
 
 # Command to execute before any tests are run during MemCheck stage
-set(CTEST_CUSTOM_PRE_MEMCHECK)
+set(CTEST_CUSTOM_PRE_MEMCHECK "@CTEST_CUSTOM_PRE_MEMCHECK@")
 
 # Command to execute after any tests are run during MemCheck stage
-set(CTEST_CUSTOM_POST_MEMCHECK)
+set(CTEST_CUSTOM_POST_MEMCHECK "@CTEST_CUSTOM_POST_MEMCHECK@")
 
 # Regular expression for excluding files from coverage testing
-set(CTEST_CUSTOM_COVERAGE_EXCLUDE)
+set(CTEST_CUSTOM_COVERAGE_EXCLUDE "@CTEST_CUSTOM_COVERAGE_EXCLUDE@")