diff --git a/ProcessLib/HeatTransportBHE/Tests.cmake b/ProcessLib/HeatTransportBHE/Tests.cmake
index ad9a21f086e3b77f34036c94f6707fe8f8609014..4e47beed81ed47c133caa8535f7f380c840d2064 100644
--- a/ProcessLib/HeatTransportBHE/Tests.cmake
+++ b/ProcessLib/HeatTransportBHE/Tests.cmake
@@ -83,22 +83,24 @@ AddTest(
     BHE_GW_advection_ts_10_t_500.000000.vtu BHE_GW_advection_ts_10_t_500.000000.vtu temperature_soil temperature_soil 1e-12 1e-13
 )
 
-AddTest(
-    NAME HeatTransportBHE_3D_3BHEs_array
-    PATH Parabolic/T/3D_3BHEs_array
-    RUNTIME 50
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS 3bhes_1U.prj
-    WRAPPER time
-    TESTER vtkdiff
-    REQUIREMENTS OGS_USE_PYTHON AND NOT OGS_USE_MPI AND (${Python3_VERSION} VERSION_LESS 3.9)
-    PYTHON_PACKAGES "TESPy=0.3.2 --python \">=3.6,<3.9\""
-    DIFF_DATA
-    3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_soil temperature_soil 1e-12 1e-13
-    3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE1 temperature_BHE1 1e-10 1e-13
-    3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE2 temperature_BHE2 1e-10 1e-13
-    3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE3 temperature_BHE3 1e-10 1e-13
-)
+if("${Python3_VERSION}" VERSION_LESS 3.9)
+    AddTest(
+        NAME HeatTransportBHE_3D_3BHEs_array
+        PATH Parabolic/T/3D_3BHEs_array
+        RUNTIME 50
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS 3bhes_1U.prj
+        WRAPPER time
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_PYTHON AND NOT OGS_USE_MPI
+        PYTHON_PACKAGES "TESPy=0.3.2 --python \">=3.6,<3.9\""
+        DIFF_DATA
+        3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_soil temperature_soil 1e-12 1e-13
+        3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE1 temperature_BHE1 1e-10 1e-13
+        3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE2 temperature_BHE2 1e-10 1e-13
+        3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE3 temperature_BHE3 1e-10 1e-13
+    )
+endif()
 
 AddTest(
     NAME HeatTransportBHE_single_pipe_flow_EUBHE
diff --git a/scripts/ci/extends/container-maker-setup.yml b/scripts/ci/extends/container-maker-setup.yml
index f7198fbdc49a19feb36d9747fb0c2206fcc8a3e5..e8136e4f44c84ca75fe31738a683e78830cb1e09 100644
--- a/scripts/ci/extends/container-maker-setup.yml
+++ b/scripts/ci/extends/container-maker-setup.yml
@@ -2,5 +2,5 @@
   before_script:
     - git submodule update --init ThirdParty/container-maker
     - cd ThirdParty/container-maker
-    - rm -rf _out
+    - rm -rf _out .venv
     - poetry install