diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index 03cd43222aa6ce4629b2895650de2d1926e560b2..890b873a8a29b33739bebf9a371995e2a20323a3 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -659,6 +659,7 @@ AddTest(
 AddTest(
     NAME Parallel_2D_StaggeredScheme_ComponentTransport_TracerSimulation
     PATH Parabolic/ComponentTransport/TracerSimulation
+    EXECUTABLE ogs
     EXECUTABLE_ARGS TracerSimulation.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 4
@@ -1101,4 +1102,4 @@ AddTest(
     TemperatureField_transportts_219_t_18921600.000000_expected.vtu TemperatureField_transport_ts_219_t_18921600.000000.vtu Cs Cs 1e-10 1e-16
     TemperatureField_transportts_292_t_25228800.000000_expected.vtu TemperatureField_transport_ts_292_t_25228800.000000.vtu Cs Cs 1e-10 1e-16
     TemperatureField_transportts_365_t_31536000.000000_expected.vtu TemperatureField_transport_ts_365_t_31536000.000000.vtu Cs Cs 1e-10 1e-16
-)
\ No newline at end of file
+)
diff --git a/ProcessLib/HT/Tests.cmake b/ProcessLib/HT/Tests.cmake
index e4bbd09b2053902fe7d6dabc6180953500ae64f9..f6d6cac2cb5e7f1fc23eb25598d7d2dfd25229a2 100644
--- a/ProcessLib/HT/Tests.cmake
+++ b/ProcessLib/HT/Tests.cmake
@@ -363,6 +363,7 @@ AddTest(
     NAME Parallel_2D_ThermalConvection_constviscosity
     PATH Parabolic/HT/ConstViscosity
     RUNTIME 61 # Actual RUNTIME?
+    EXECUTABLE ogs
     EXECUTABLE_ARGS square_5500x5500.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 4
@@ -383,6 +384,7 @@ AddTest(
     DISABLED
     NAME Parallel_2D_ThermalConvection_constviscosityStaggeredScheme
     PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
+    EXECUTABLE ogs
     RUNTIME 61 # Actual RUNTIME?
     EXECUTABLE_ARGS square_5500x5500_staggered_scheme.prj
     WRAPPER mpirun
@@ -399,6 +401,7 @@ AddTest(
     DISABLED
     NAME 2D_Adaptive_dt_ThermalConvection_constviscosityStaggeredScheme
     PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
+    EXECUTABLE ogs
     RUNTIME 61 # Actual RUNTIME?
     EXECUTABLE_ARGS square_5500x5500_staggered_scheme_adaptive_dt.prj
     WRAPPER mpirun
@@ -416,6 +419,7 @@ AddTest(
 # AddTest(
 #     NAME HT_a_DECOVALEX_THMC_based_Example
 #     PATH Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample
+#     EXECUTABLE ogs
 #     EXECUTABLE_ARGS th_decovalex.prj
 #     WRAPPER mpirun
 #     WRAPPER_ARGS -np 1
diff --git a/ProcessLib/HeatConduction/Tests.cmake b/ProcessLib/HeatConduction/Tests.cmake
index c616fbd7c2c05eca9faabff79905ef9ec91430d0..4195d171ec4993a568034730350af021f297dd49 100644
--- a/ProcessLib/HeatConduction/Tests.cmake
+++ b/ProcessLib/HeatConduction/Tests.cmake
@@ -170,6 +170,7 @@ AddTest(
 AddTest(
     NAME 1D_HeatConduction_dirichlet_SourceTerm_PETSc
     PATH Parabolic/T/1D_dirichlet_source-term
+    EXECUTABLE ogs
     EXECUTABLE_ARGS line_1_line_1e2_source_term.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
diff --git a/ProcessLib/LiquidFlow/Tests.cmake b/ProcessLib/LiquidFlow/Tests.cmake
index f5bf96d91cf1631856d47298ef18f222c57a80ec..da561dbc015274a5b607211fd3fff32b1e318cb1 100644
--- a/ProcessLib/LiquidFlow/Tests.cmake
+++ b/ProcessLib/LiquidFlow/Tests.cmake
@@ -106,6 +106,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_h1_1Dsource
     PATH Parabolic/LiquidFlow/Verification/h1_1Dsource
+    EXECUTABLE ogs
     EXECUTABLE_ARGS h1_1Dsource.prj
     WRAPPER time
     TESTER vtkdiff
@@ -117,6 +118,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_h1_1Dsteady
     PATH Parabolic/LiquidFlow/Verification/h1_1Dsteady
+    EXECUTABLE ogs
     EXECUTABLE_ARGS h1_1Dsteady.prj
     WRAPPER time
     TESTER vtkdiff
@@ -128,6 +130,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_h1_3Dhydstat
     PATH Parabolic/LiquidFlow/Verification/h1_3Dhydstat
+    EXECUTABLE ogs
     EXECUTABLE_ARGS h1_3Dhydstat.prj
     WRAPPER time
     TESTER vtkdiff
@@ -139,6 +142,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_h2_1D1bt
     PATH Parabolic/LiquidFlow/Verification/h2_1D1bt
+    EXECUTABLE ogs
     EXECUTABLE_ARGS h2_1D1bt.prj
     WRAPPER time
     TESTER vtkdiff
@@ -151,6 +155,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_h2_1D2bt
     PATH Parabolic/LiquidFlow/Verification/h2_1D2bt
+    EXECUTABLE ogs
     EXECUTABLE_ARGS h2_1D2bt.prj
     WRAPPER time
     TESTER vtkdiff
@@ -165,6 +170,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_LineDirichletNeumannBC
     PATH Parabolic/LiquidFlow/LineDirichletNeumannBC
+    EXECUTABLE ogs
     EXECUTABLE_ARGS line_dirichlet_neumannBC.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -177,6 +183,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_GravityDriven
     PATH Parabolic/LiquidFlow/GravityDriven
+    EXECUTABLE ogs
     EXECUTABLE_ARGS gravity_driven.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -189,6 +196,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare
     PATH Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare
+    EXECUTABLE ogs
     EXECUTABLE_ARGS pressureBC_at_corner_of_anisotropic_square.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -200,6 +208,7 @@ AddTest(
 AddTest(
     NAME LiquidFlow_AxisymTheis
     PATH Parabolic/LiquidFlow/AxiSymTheis
+    EXECUTABLE ogs
     EXECUTABLE_ARGS axisym_theis.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -212,6 +221,7 @@ AddTest(
     NAME LiquidFlow_Anisotropic_GravityDriven3D
     PATH Parabolic/LiquidFlow/GravityDriven3D
     RUNTIME 115
+    EXECUTABLE ogs
     EXECUTABLE_ARGS anisotropic_gravity_driven3D.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -225,6 +235,7 @@ AddTest(
     NAME LiquidFlow_Isotropic_GravityDriven3D
     PATH Parabolic/LiquidFlow/GravityDriven3D
     RUNTIME 5
+    EXECUTABLE ogs
     EXECUTABLE_ARGS isotropic_gravity_driven3D.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -237,6 +248,7 @@ AddTest(
 AddTest(
     NAME LiquidFlowDirichletBCWithinTimeInterval
     PATH Parabolic/LiquidFlow/TimeIntervalDirichletBC
+    EXECUTABLE ogs
     EXECUTABLE_ARGS TimeIntervalDirichletBC.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
diff --git a/ProcessLib/RichardsFlow/Tests.cmake b/ProcessLib/RichardsFlow/Tests.cmake
index 56c054869c40b95746c2cee59280748c25c91dd5..9438b219c9ce4bf44a85cdd53feb94ed9c5cf98c 100644
--- a/ProcessLib/RichardsFlow/Tests.cmake
+++ b/ProcessLib/RichardsFlow/Tests.cmake
@@ -95,6 +95,7 @@ AddTest(
 AddTest(
     NAME Parallel_RichardsMechanics_RichardsFlow_2d_richardsflow
     PATH RichardsMechanics
+    EXECUTABLE ogs
     EXECUTABLE_ARGS RichardsFlow_2d_richardsflow.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
diff --git a/ProcessLib/SteadyStateDiffusion/Tests.cmake b/ProcessLib/SteadyStateDiffusion/Tests.cmake
index 84b474bfbac74a59f51bf41d2196d5e720ef1342..bd8bf223a5f596308cd85469e4080e5e78b39350 100644
--- a/ProcessLib/SteadyStateDiffusion/Tests.cmake
+++ b/ProcessLib/SteadyStateDiffusion/Tests.cmake
@@ -373,6 +373,7 @@ AddTest(
 AddTest(
     NAME ParallelFEM_GroundWaterFlow2D
     PATH EllipticPETSc
+    EXECUTABLE ogs
     EXECUTABLE_ARGS quad_20x10_GroundWaterFlow.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 3
@@ -387,6 +388,7 @@ AddTest(
 AddTest(
     NAME ParallelFEM_GroundWaterFlow3D_DirichletBC
     PATH EllipticPETSc
+    EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 3
@@ -401,6 +403,7 @@ AddTest(
 AddTest(
     NAME ParallelFEM_GroundWaterFlow3D_NeumannBC
     PATH EllipticPETSc
+    EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_neumann.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 3
@@ -415,6 +418,7 @@ AddTest(
 AddTest(
     NAME ParallelFEM_GroundWaterFlow2D_NeumannBC
     PATH EllipticPETSc
+    EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e1_neumann.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 2
@@ -433,6 +437,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
     AddTest(
         NAME SteadyStateDiffusion_cube_1x1x1_${mesh_size}
         PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -445,6 +450,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
     AddTest(
         NAME SteadyStateDiffusion_cube_1x1x1_Neumann_${mesh_size}
         PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -467,6 +473,7 @@ foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     AddTest(
         NAME SteadyStateDiffusion_cube_1x1x1_${mesh_size}
         PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         RUNTIME ${RUNTIME}
         EXECUTABLE_ARGS cube_${mesh_size}.prj
         WRAPPER mpirun
@@ -480,6 +487,7 @@ foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     AddTest(
         NAME SteadyStateDiffusion_cube_1x1x1_Neumann_${mesh_size}
         PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         RUNTIME ${RUNTIME}
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
         WRAPPER mpirun
@@ -496,6 +504,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
     AddTest(
         NAME SteadyStateDiffusion_square_1x1_${mesh_size}
         PATH Elliptic/square_1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         EXECUTABLE_ARGS square_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -508,6 +517,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
     AddTest(
         NAME SteadyStateDiffusion_square_1x1_Neumann_${mesh_size}
         PATH Elliptic/square_1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -529,6 +539,7 @@ foreach(mesh_size 1e5 1e6)
     AddTest(
         NAME SteadyStateDiffusion_square_1x1_${mesh_size}
         PATH Elliptic/square_1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         RUNTIME ${RUNTIME}
         EXECUTABLE_ARGS square_${mesh_size}.prj
         WRAPPER mpirun
@@ -542,6 +553,7 @@ foreach(mesh_size 1e5 1e6)
     AddTest(
         NAME SteadyStateDiffusion_square_1x1_Neumann_${mesh_size}
         PATH Elliptic/square_1x1_SteadyStateDiffusion
+        EXECUTABLE ogs
         RUNTIME ${RUNTIME}
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
         WRAPPER mpirun
@@ -558,6 +570,7 @@ foreach(mesh_size 1e1)
     AddTest(
         NAME SteadyStateDiffusion_line_1_${mesh_size}
         PATH Elliptic/line_1_SteadyStateDiffusion
+        EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -570,6 +583,7 @@ foreach(mesh_size 1e1)
     AddTest(
         NAME SteadyStateDiffusion_line_1_Neumann_${mesh_size}
         PATH Elliptic/line_1_SteadyStateDiffusion
+        EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
diff --git a/ProcessLib/TES/Tests.cmake b/ProcessLib/TES/Tests.cmake
index a8f1b4bb33a46f6e75153b1136594449ccd3e854..10bf00320aafe952f9ad934ff96a1a3559e970a3 100644
--- a/ProcessLib/TES/Tests.cmake
+++ b/ProcessLib/TES/Tests.cmake
@@ -71,6 +71,7 @@ AddTest(
 AddTest(
     NAME TES_zeolite_discharge_small
     PATH Parabolic/TES/1D
+    EXECUTABLE ogs
     EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1
@@ -87,6 +88,7 @@ AddTest(
     NAME TES_zeolite_discharge
     PATH Parabolic/TES/1D
     RUNTIME 8
+    EXECUTABLE ogs
     EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
     WRAPPER mpirun
     WRAPPER_ARGS -np 1