diff --git a/opm/json/tests/CMakeLists.txt b/opm/json/tests/CMakeLists.txt
index 6f2bd0a5d..45c85b768 100644
--- a/opm/json/tests/CMakeLists.txt
+++ b/opm/json/tests/CMakeLists.txt
@@ -2,4 +2,4 @@ add_executable( runjsonTests jsonTests.cpp )
 target_link_libraries( runjsonTests opm-json ${Boost_LIBRARIES})
 
 set_source_files_properties( jsonTests.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable")
-add_test( NAME runjsonTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runjsonTests )
+add_test( NAME runjsonTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runjsonTests )
diff --git a/opm/parser/eclipse/Deck/tests/CMakeLists.txt b/opm/parser/eclipse/Deck/tests/CMakeLists.txt
index 718bd52bf..43d0534bd 100644
--- a/opm/parser/eclipse/Deck/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/Deck/tests/CMakeLists.txt
@@ -1,28 +1,28 @@
 add_executable(runDeckRecordTests DeckRecordTests.cpp)
 target_link_libraries(runDeckRecordTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runDeckRecordTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDeckRecordTests  )
+add_test(NAME runDeckRecordTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckRecordTests  )
 
 add_executable(runDeckIntItemTests DeckIntItemTests.cpp)
 target_link_libraries(runDeckIntItemTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runDeckIntItemTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDeckIntItemTests  )
+add_test(NAME runDeckIntItemTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckIntItemTests  )
 
 add_executable(runDeckDoubleItemTests DeckDoubleItemTests.cpp)
 target_link_libraries(runDeckDoubleItemTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runDeckDoubleItemTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDeckDoubleItemTests  )
+add_test(NAME runDeckDoubleItemTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckDoubleItemTests  )
 
 add_executable(runDeckStringItemTests DeckStringItemTests.cpp)
 target_link_libraries(runDeckStringItemTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runDeckStringItemTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDeckStringItemTests  )
+add_test(NAME runDeckStringItemTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckStringItemTests  )
 
 add_executable(runDeckTests DeckTests.cpp)
 target_link_libraries(runDeckTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runDeckTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDeckTests  )
+add_test(NAME runDeckTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckTests  )
 
 add_executable(runKeywordContainerTests KeywordContainerTests.cpp)
 target_link_libraries(runKeywordContainerTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runKeywordContainerTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runKeywordContainerTests  )
+add_test(NAME runKeywordContainerTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runKeywordContainerTests  )
 
 add_executable(runDeckKeywordTests DeckKeywordTests.cpp)
 target_link_libraries(runDeckKeywordTests Parser  ${Boost_LIBRARIES})
-add_test(NAME runDeckKeywordTests  COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDeckKeywordTests  )
+add_test(NAME runDeckKeywordTests  COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckKeywordTests  )
 
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
index d4558f9e8..699ecdf07 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
@@ -1,53 +1,53 @@
 add_executable(runTimeMapTests TimeMapTest.cpp)
 target_link_libraries(runTimeMapTests Parser ${Boost_LIBRARIES})
-add_test(NAME runTimeMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runTimeMapTests )
+add_test(NAME runTimeMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTimeMapTests )
 
 
 add_executable(runScheduleTests ScheduleTests.cpp)
 target_link_libraries(runScheduleTests Parser ${Boost_LIBRARIES})
-add_test(NAME runScheduleTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runScheduleTests )
+add_test(NAME runScheduleTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleTests )
 
 
 add_executable(runWellTests WellTests.cpp)
 target_link_libraries(runWellTests Parser ${Boost_LIBRARIES})
-add_test(NAME runWellTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runWellTests )
+add_test(NAME runWellTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runWellTests )
 
 
 add_executable(runWellSetTests WellSetTests.cpp)
 target_link_libraries(runWellSetTests Parser ${Boost_LIBRARIES})
-add_test(NAME runWellSetTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runWellSetTests )
+add_test(NAME runWellSetTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runWellSetTests )
 
 
 add_executable(runGroupTests GroupTests.cpp)
 target_link_libraries(runGroupTests Parser ${Boost_LIBRARIES})
-add_test(NAME runGroupTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runGroupTests )
+add_test(NAME runGroupTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTests )
 
 
 add_executable(runScheduleEnumTests ScheduleEnumTests.cpp)
 target_link_libraries(runScheduleEnumTests Parser ${Boost_LIBRARIES})
-add_test(NAME runScheduleEnumTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runScheduleEnumTests )
+add_test(NAME runScheduleEnumTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleEnumTests )
 
 
 add_executable(runCompletionTests CompletionTests.cpp)
 target_link_libraries(runCompletionTests Parser ${Boost_LIBRARIES})
-add_test(NAME runCompletionTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runCompletionTests )
+add_test(NAME runCompletionTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCompletionTests )
 
 
 add_executable(runCompletionSetTests CompletionSetTests.cpp)
 target_link_libraries(runCompletionSetTests Parser ${Boost_LIBRARIES})
-add_test(NAME runCompletionSetTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runCompletionSetTests )
+add_test(NAME runCompletionSetTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCompletionSetTests )
 
 
 add_executable(runDynamicStateTests DynamicStateTests.cpp)
 target_link_libraries(runDynamicStateTests Parser ${Boost_LIBRARIES})
-add_test(NAME runDynamicStateTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runDynamicStateTests )
+add_test(NAME runDynamicStateTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDynamicStateTests )
 
 
 add_executable(runGroupTreeNodeTests GroupTreeNodeTests.cpp)
 target_link_libraries(runGroupTreeNodeTests Parser ${Boost_LIBRARIES})
-add_test(NAME runGroupTreeNodeTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runGroupTreeNodeTests )
+add_test(NAME runGroupTreeNodeTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTreeNodeTests )
 
 
 add_executable(runGroupTreeTests GroupTreeTests.cpp)
 target_link_libraries(runGroupTreeTests Parser ${Boost_LIBRARIES})
-add_test(NAME runGroupTreeTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runGroupTreeTests )
+add_test(NAME runGroupTreeTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTreeTests )
diff --git a/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt
index dc12cea24..5207619c1 100644
--- a/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/EclipseState/tests/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(runEclipseStateTests EclipseStateTests.cpp)
 target_link_libraries(runEclipseStateTests Parser ${Boost_LIBRARIES})
-add_test(NAME runEclipseStateTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runEclipseStateTests )
+add_test(NAME runEclipseStateTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runEclipseStateTests )
diff --git a/opm/parser/eclipse/IntegrationTests/CMakeLists.txt b/opm/parser/eclipse/IntegrationTests/CMakeLists.txt
index 397ad5261..43fba35da 100644
--- a/opm/parser/eclipse/IntegrationTests/CMakeLists.txt
+++ b/opm/parser/eclipse/IntegrationTests/CMakeLists.txt
@@ -2,45 +2,45 @@ add_definitions( -DKEYWORD_DIRECTORY="${PROJECT_SOURCE_DIR}/opm/parser/share/key
 
 add_executable(runIntegrationTests IntegrationTests.cpp)
 target_link_libraries(runIntegrationTests Parser ${Boost_LIBRARIES})
-add_test(NAME runIntegrationTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runIntegrationTests)
+add_test(NAME runIntegrationTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runIntegrationTests)
 set_property(SOURCE IntegrationTests.cpp PROPERTY COMPILE_FLAGS "-Wno-error")
 
 
 add_executable(runParseWCONHIST ParseWCONHIST.cpp)
 target_link_libraries(runParseWCONHIST Parser ${Boost_LIBRARIES})
-add_test(NAME runParseWCONHIST WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseWCONHIST)
+add_test(NAME runParseWCONHIST WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseWCONHIST)
 
 add_executable(runParsePORO ParsePORO.cpp)
 target_link_libraries(runParsePORO Parser ${Boost_LIBRARIES})
-add_test(NAME runParsePORO WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParsePORO) 
+add_test(NAME runParsePORO WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePORO) 
 
 add_executable(runParseTVDP ParseTVDP.cpp)
 target_link_libraries(runParseTVDP Parser ${Boost_LIBRARIES})
-add_test(NAME runParseTVDP WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseTVDP) 
+add_test(NAME runParseTVDP WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseTVDP) 
 
 add_executable(runParseDENSITY ParseDENSITY.cpp)
 target_link_libraries(runParseDENSITY Parser ${Boost_LIBRARIES})
-add_test(NAME runParseDENSITY WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseDENSITY) 
+add_test(NAME runParseDENSITY WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseDENSITY) 
 
 add_executable(runParseVFPPROD ParseVFPPROD.cpp)
 target_link_libraries(runParseVFPPROD Parser ${Boost_LIBRARIES})
-add_test(NAME runParseVFPPROD WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseVFPPROD) 
+add_test(NAME runParseVFPPROD WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseVFPPROD) 
 
 add_executable(runScheduleCreateFromDeck ScheduleCreateFromDeck.cpp)
 target_link_libraries(runScheduleCreateFromDeck Parser ${Boost_LIBRARIES})
-add_test(NAME runScheduleCreateFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runScheduleCreateFromDeck) 
+add_test(NAME runScheduleCreateFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleCreateFromDeck) 
 
 add_executable(runCompletionsFromDeck CompletionsFromDeck.cpp)
 target_link_libraries(runCompletionsFromDeck Parser ${Boost_LIBRARIES})
-add_test(NAME runCompletionsFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runCompletionsFromDeck) 
+add_test(NAME runCompletionsFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCompletionsFromDeck) 
 
 add_executable(runParseACTION ParseACTION.cpp)
 target_link_libraries(runParseACTION Parser ${Boost_LIBRARIES})
-add_test(NAME runParseACTION WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseACTION)
+add_test(NAME runParseACTION WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseACTION)
 
 add_executable(runIncludeTest IncludeTest.cpp)
 target_link_libraries(runIncludeTest Parser ${Boost_LIBRARIES})
-add_test(NAME runIncludeTest WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runIncludeTest)
+add_test(NAME runIncludeTest WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runIncludeTest)
 
 
 
@@ -49,41 +49,41 @@ add_executable(runParseEQUIL ParseEQUIL.cpp)
 target_link_libraries(runParseEQUIL Parser ${Boost_LIBRARIES})
 add_test(NAME runParseEQUIL 
          WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} 
-         COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParseEQUIL)
+         COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseEQUIL)
 
 add_executable(runParseRSVD ParseRSVD.cpp)
 target_link_libraries(runParseRSVD Parser ${Boost_LIBRARIES})
 add_test(NAME runParseRSVD 
          WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} 
-         COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParseRSVD)
+         COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseRSVD)
          
 add_executable(runParsePVTG ParsePVTG.cpp)
 target_link_libraries(runParsePVTG Parser ${Boost_LIBRARIES})
 add_test(NAME runParsePVTG 
          WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} 
-         COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParsePVTG)         
+         COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePVTG)         
 
 add_executable(runParsePVTO ParsePVTO.cpp)
 target_link_libraries(runParsePVTO Parser ${Boost_LIBRARIES})
 add_test(NAME runParsePVTO 
          WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} 
-         COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParsePVTO)         
+         COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePVTO)         
 
 add_executable(runParseSWOF ParseSWOF.cpp)
 target_link_libraries(runParseSWOF Parser ${Boost_LIBRARIES})
 add_test(NAME runParseSWOF 
          WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} 
-         COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParseSWOF)         
+         COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseSWOF)         
 
 add_executable(runParseSGOF ParseSGOF.cpp)
 target_link_libraries(runParseSGOF Parser ${Boost_LIBRARIES})
 add_test(NAME runParseSGOF 
          WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} 
-         COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParseSGOF)         
+         COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseSGOF)         
 
 if (INCLUDE_STATOIL_TESTS) 
    add_executable(runIntegrationTestsInternalData IntegrationTestsInternalData.cpp)
    target_link_libraries(runIntegrationTestsInternalData Parser ${Boost_LIBRARIES})
-   add_test(NAME runIntegrationTestsInternalData WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runIntegrationTestsInternalData )
+   add_test(NAME runIntegrationTestsInternalData WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runIntegrationTestsInternalData )
    set_property(TEST runIntegrationTestsInternalData PROPERTY LABELS Statoil)
 endif()
diff --git a/opm/parser/eclipse/Parser/tests/CMakeLists.txt b/opm/parser/eclipse/Parser/tests/CMakeLists.txt
index caacf9116..1f5ab535d 100644
--- a/opm/parser/eclipse/Parser/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/Parser/tests/CMakeLists.txt
@@ -10,11 +10,11 @@ target_link_libraries(runParserRecordTests Parser ${Boost_LIBRARIES})
 target_link_libraries(runParserItemTests Parser ${Boost_LIBRARIES})
 target_link_libraries(runParserEnumTests Parser ${Boost_LIBRARIES})
 
-add_test(NAME runParserTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParserTests )
-add_test(NAME runParserKeywordTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParserKeywordTests )
-add_test(NAME runParserRecordTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParserRecordTests )
-add_test(NAME runParserItemTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParserItemTests )
-add_test(NAME runParserEnumTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runParserEnumTests )
+add_test(NAME runParserTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserTests )
+add_test(NAME runParserKeywordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserKeywordTests )
+add_test(NAME runParserRecordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserRecordTests )
+add_test(NAME runParserItemTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserItemTests )
+add_test(NAME runParserEnumTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserEnumTests )
 
 set_property(SOURCE ParserRecordTests.cpp PROPERTY COMPILE_FLAGS "-Wno-error")
 
@@ -30,7 +30,7 @@ add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest
 
 add_executable( inlineItemTest ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp )
 target_link_libraries( inlineItemTest buildParser ${Boost_LIBRARIES} )
-add_test(inlineItemTest ${EXECUTABLE_OUTPUT_PATH}/inlineItemTest)
+add_test(inlineItemTest ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/inlineItemTest)
 
 #-----------------------------------------------------------------
 
@@ -43,5 +43,5 @@ add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/generated-source/inlineKeywordT
 
 add_executable( inlineKeywordTest ${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp )
 target_link_libraries( inlineKeywordTest buildParser ${Boost_LIBRARIES} )
-add_test(inlineKeywordTest ${EXECUTABLE_OUTPUT_PATH}/inlineKeywordTest)
+add_test(inlineKeywordTest ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/inlineKeywordTest)
 
diff --git a/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt b/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt
index 9eacace0e..f5e1cc65c 100644
--- a/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/RawDeck/tests/CMakeLists.txt
@@ -6,6 +6,6 @@ target_link_libraries(runStarTokenTests Parser ${Boost_LIBRARIES})
 target_link_libraries(runRawRecordTests Parser ${Boost_LIBRARIES})
 target_link_libraries(runRawKeywordTests Parser ${Boost_LIBRARIES})
 
-add_test(NAME runRawRecordTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runRawRecordTests )
-add_test(NAME runRawKeywordTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runRawKeywordTests )
-add_test(NAME runStarTokenTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runStarTokenTests )
+add_test(NAME runRawRecordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runRawRecordTests )
+add_test(NAME runRawKeywordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runRawKeywordTests )
+add_test(NAME runStarTokenTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runStarTokenTests )
diff --git a/opm/parser/eclipse/Units/tests/CMakeLists.txt b/opm/parser/eclipse/Units/tests/CMakeLists.txt
index 87c1e1702..0194ae2fe 100644
--- a/opm/parser/eclipse/Units/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/Units/tests/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(runUnitTests UnitTests.cpp)
 target_link_libraries(runUnitTests Parser ${Boost_LIBRARIES})
-add_test(NAME runUnitTests COMMAND ${EXECUTABLE_OUTPUT_PATH}/runUnitTests )
+add_test(NAME runUnitTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runUnitTests )
diff --git a/opm/parser/eclipse/Utility/tests/CMakeLists.txt b/opm/parser/eclipse/Utility/tests/CMakeLists.txt
index 0cdec5bf6..6841b1e37 100644
--- a/opm/parser/eclipse/Utility/tests/CMakeLists.txt
+++ b/opm/parser/eclipse/Utility/tests/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(runSimpleTableTests SimpleTableTests.cpp)
 target_link_libraries(runSimpleTableTests Parser ${Boost_LIBRARIES})
-add_test(NAME runSimpleTableTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runTimeMapTests )
+add_test(NAME runSimpleTableTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTimeMapTests )