diff --git a/CEP/DP3/SPWCombine/include/SPWCombine/CMakeLists.txt b/CEP/DP3/SPWCombine/include/SPWCombine/CMakeLists.txt
index eb757d4508b986d4acb373e189d9ef5b5025378d..04c3c85ff94a95e0aef01ba9bc9e1f3a3df528d0 100644
--- a/CEP/DP3/SPWCombine/include/SPWCombine/CMakeLists.txt
+++ b/CEP/DP3/SPWCombine/include/SPWCombine/CMakeLists.txt
@@ -5,11 +5,6 @@ set(inst_HEADERS
   CombinerProcessControl.h
   SPWCombine.h)
 
-# Add definition of include path suffix definition, because the header files
-# reside in a non-standard location.
-set(${PACKAGE_NAME}_INCLUDE_PATH_SUFFIX SPWCombine
-  CACHE INTERNAL "Include path suffix for package \"${PACKAGE_NAME}\"")
-
 # Create symbolic link to include directory.
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/RTCP/Storage/test/CMakeLists.txt b/RTCP/Storage/test/CMakeLists.txt
index 541dc119730f64d1822159a85058d7f70332fb75..65fe96dbb03de08dec3245dbb38923ea10b09691 100644
--- a/RTCP/Storage/test/CMakeLists.txt
+++ b/RTCP/Storage/test/CMakeLists.txt
@@ -2,4 +2,4 @@
 
 include(LofarCTest)
 
-lofar_add_test(tAH_TestStorage tAH_TestStorage.cc AH_TestStorage.cc)
+#lofar_add_test(tAH_TestStorage tAH_TestStorage.cc AH_TestStorage.cc)