diff --git a/scripts/cmake/GitSetup.cmake b/scripts/cmake/GitSetup.cmake
index ebc1758a059a82b58420fb7583253a1e3a1d7e68..d7aa117ca154cb0e970957ff8304ef2ec0105f49 100644
--- a/scripts/cmake/GitSetup.cmake
+++ b/scripts/cmake/GitSetup.cmake
@@ -19,7 +19,7 @@ if(NOT _IS_GIT_REPO)
     if(_IS_GIT_REPO GREATER 0)
         set(_IS_GIT_REPO FALSE CACHE INTERNAL "")
         if(NOT DEFINED OGS_VERSION)
-            if(DEFINED $ENV{CI})
+            if(DEFINED ENV{CI})
                 message(
                     FATAL_ERROR
                         "No git repository found at ${PROJECT_SOURCE_DIR}! "
diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake
index 9d8fbb8a9ad586a6d9b9368a13309d8480469f70..66f49bd57d914532ded0c8bf59844e039c5eaeee 100644
--- a/scripts/cmake/test/AddTestTester.cmake
+++ b/scripts/cmake/test/AddTestTester.cmake
@@ -59,8 +59,8 @@ foreach(cmd ${TESTER_COMMAND})
                 ECHO_OUTPUT_VARIABLE
                 ECHO_ERROR_VARIABLE
             )
-            file(WRITE ${LOG_FILE} ${OUTPUT})
             if(NOT EXIT_CODE STREQUAL "0")
+                file(WRITE ${LOG_FILE} ${OUTPUT})
                 message(WARNING "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
                 set(TEST_FAILED TRUE)
             endif()
@@ -77,8 +77,8 @@ foreach(cmd ${TESTER_COMMAND})
             ECHO_OUTPUT_VARIABLE
             ECHO_ERROR_VARIABLE
         )
-        file(WRITE ${LOG_FILE} ${OUTPUT})
         if(NOT EXIT_CODE STREQUAL "0")
+            file(WRITE ${LOG_FILE} ${OUTPUT})
             message(WARNING "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
             set(TEST_FAILED TRUE)
         endif()
diff --git a/scripts/cmake/test/AddTestWrapper.cmake b/scripts/cmake/test/AddTestWrapper.cmake
index 44ddbc76f65f44c2547fd7e944179963042596d3..96a7bb59db425181da64c066a8715c8370d56588 100644
--- a/scripts/cmake/test/AddTestWrapper.cmake
+++ b/scripts/cmake/test/AddTestWrapper.cmake
@@ -19,6 +19,10 @@ execute_process(
     ERROR_FILE ${LOG_FILE}
 )
 
-if(NOT EXIT_CODE STREQUAL "0")
+if(EXIT_CODE STREQUAL "0")
+    if(DEFINED ENV{CI})
+        file(REMOVE ${LOG_FILE})
+    endif()
+else()
     message(FATAL_ERROR "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
 endif()
diff --git a/scripts/cmake/test/OgsTestWrapper.cmake b/scripts/cmake/test/OgsTestWrapper.cmake
index a90dbea0810619197147f300d0979a6548d308ca..e2dbdba8d8dc659d46c8da40ca84167f8366e7b9 100644
--- a/scripts/cmake/test/OgsTestWrapper.cmake
+++ b/scripts/cmake/test/OgsTestWrapper.cmake
@@ -6,6 +6,10 @@ execute_process(
     ERROR_FILE ${LOG_FILE}
 )
 
-if(NOT EXIT_CODE STREQUAL "0")
+if(EXIT_CODE STREQUAL "0")
+    if(DEFINED ENV{CI})
+        file(REMOVE ${LOG_FILE})
+    endif()
+else()
     message(FATAL_ERROR "Exit code: ${EXIT_CODE}; log file: ${LOG_FILE}")
 endif()