diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt
index aec19e69..eecbd50f 100644
--- a/c++/app4triqs/CMakeLists.txt
+++ b/c++/app4triqs/CMakeLists.txt
@@ -47,8 +47,11 @@ if(ANALYZE_SOURCES)
 	  --std=c++17
 	  --template=gcc
 	  --verbose
+	  --force
 	  --quiet
           ${sources}
+	WORKING_DIRECTORY
+	  ${CMAKE_CURRENT_SOURCE_DIR}
     )
   else()
     message(STATUS "cppcheck not found in $PATH. Please consider installing cppcheck for additional checks!")
diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
index 273e8b40..4f31f316 100644
--- a/test/c++/CMakeLists.txt
+++ b/test/c++/CMakeLists.txt
@@ -30,8 +30,9 @@ foreach(test ${all_tests})
       --std=c++17
       --template=gcc
       --verbose
+      --force
       --quiet
-      ${CMAKE_CURRENT_SOURCE_DIR}/${test}.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/${test}
     )
   endif()
 endforeach()