diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 0a4bb755c93893f9f72bb680c39a10a444792894..1704da6ebac527ebec3863802971e9bf643a270a 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -17,7 +17,8 @@
 #                  OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
 #   VIS <vtu output file(s)> # optional for documentation
 #   RUNTIME <in seconds> # optional for optimizing ctest duration
-#                          values should be taken from eve serial job
+#                          values should be taken from envinf job
+#   DISABLED # optional, disables the test
 # )
 #
 # Conditional arguments:
@@ -43,7 +44,7 @@ function (AddTest)
     set(LARGE_RUNTIME 60)
 
     # parse arguments
-    set(options NONE)
+    set(options DISABLED)
     set(oneValueArgs EXECUTABLE PATH NAME WRAPPER TESTER ABSTOL RELTOL RUNTIME DEPENDS)
     set(multiValueArgs EXECUTABLE_ARGS DATA DIFF_DATA WRAPPER_ARGS REQUIREMENTS VIS)
     cmake_parse_arguments(AddTest "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -272,6 +273,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
     if(DEFINED MPI_PROCESSORS)
         set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCESSORS})
     endif()
+    set_tests_properties(${TEST_NAME} PROPERTIES DISABLED ${AddTest_DISABLED})
 
     if(TARGET ${AddTest_EXECUTABLE})
         add_dependencies(ctest ${AddTest_EXECUTABLE})
@@ -300,6 +302,9 @@ Use six arguments version of AddTest with absolute and relative tolerances")
         --debug-output
         WORKING_DIRECTORY ${AddTest_SOURCE_PATH}
     )
-    set_tests_properties(${TESTER_NAME} PROPERTIES DEPENDS ${TEST_NAME})
+    set_tests_properties(${TESTER_NAME} PROPERTIES
+        DEPENDS ${TEST_NAME}
+        DISABLED ${AddTest_DISABLED}
+    )
 
 endfunction()
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 108c898a84c669a3e7b92080922570b242528106..43f488c1010ac972242ac894ecb79f095ca3d3f5 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -5,6 +5,7 @@ function (OgsTest)
     if(NOT OGS_BUILD_CLI OR NOT BUILD_TESTING)
         return()
     endif()
+    set(options DISABLED)
     set(oneValueArgs PROJECTFILE RUNTIME)
     set(multiValueArgs WRAPPER)
     cmake_parse_arguments(OgsTest "${options}" "${oneValueArgs}"
@@ -52,7 +53,9 @@ function (OgsTest)
 
     set_tests_properties(${TEST_NAME} PROPERTIES
         ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>
-        COST ${OgsTest_RUNTIME})
+        COST ${OgsTest_RUNTIME}
+        DISABLED ${OgsTest_DISABLED}
+    )
 
     if(TARGET ${OgsTest_EXECUTABLE})
         add_dependencies(ctest ${OgsTest_EXECUTABLE})