diff --git a/scripts/cmake/test/NotebookTest.cmake b/scripts/cmake/test/NotebookTest.cmake
index 5478ff3822e99f840bbc78258abaea9287857797..29de30a70cbc65bc24f87de1edd3efa5aa8cfdb5 100644
--- a/scripts/cmake/test/NotebookTest.cmake
+++ b/scripts/cmake/test/NotebookTest.cmake
@@ -54,7 +54,7 @@ function(NotebookTest)
 
     set(TEST_NAME "nb-${NotebookTest_DIR}/${NotebookTest_NAME_WE}")
 
-    set(_exe_args Notebooks/testrunner.py --out ${Data_BINARY_DIR}
+    set(_exe_args Notebooks/testrunner.py --hugo --out ${Data_BINARY_DIR}
                   ${NotebookTest_SOURCE_DIR}/${NotebookTest_NAME}
     )
 
@@ -64,6 +64,8 @@ function(NotebookTest)
             ${CMAKE_COMMAND}
             -E env PYVISTA_HEADLESS=1
             ${CMAKE_COMMAND}
+            # TODO: only works if notebook is in a leaf directory
+            # -DFILES_TO_DELETE=${Data_BINARY_DIR}/${NotebookTest_DIR}
             -DEXECUTABLE=${Python_EXECUTABLE}
             "-DEXECUTABLE_ARGS=${_exe_args}"
             -DWORKING_DIRECTORY=${Data_SOURCE_DIR} -DCAT_LOG=TRUE -P
@@ -82,7 +84,6 @@ function(NotebookTest)
                   PATH=path_list_prepend:$<TARGET_FILE_DIR:ogs>
     )
     if(DEFINED NotebookTest_RESOURCE_LOCK)
-        message(STATUS "NB: ${NotebookTest_RESOURCE_LOCK}")
         set_tests_properties(
             ${TEST_NAME}
             PROPERTIES RESOURCE_LOCK ${NotebookTest_RESOURCE_LOCK}
diff --git a/scripts/cmake/test/OgsTestWrapper.cmake b/scripts/cmake/test/OgsTestWrapper.cmake
index b80b75671a8c4522448ad5399953a2b22650fb17..4acf05398e7952012dbf31cdbda8e7b4da62d240 100644
--- a/scripts/cmake/test/OgsTestWrapper.cmake
+++ b/scripts/cmake/test/OgsTestWrapper.cmake
@@ -1,3 +1,7 @@
+foreach(file ${FILES_TO_DELETE})
+    file(REMOVE ${file})
+endforeach()
+
 execute_process(
     COMMAND ${WRAPPER_COMMAND} ${EXECUTABLE} ${EXECUTABLE_ARGS}
     WORKING_DIRECTORY ${WORKING_DIRECTORY}