diff --git a/cscs.yml b/cscs.yml
index ee078752e9..13108ad29e 100644
--- a/cscs.yml
+++ b/cscs.yml
@@ -39,7 +39,7 @@ stages:
 .test_common:
   extends: .baremetal-runner-santis-gh200
   variables:
-    UENV: 'icon/25.2:v1'
+    UENV: 'icon/25.2:v4'
   script:
     - !reference [.setup_python, script]
     - !reference [.setup_uenv, script]
diff --git a/test/common_system_test.py b/test/common_system_test.py
index 3e960d791b..3074c8b7a3 100644
--- a/test/common_system_test.py
+++ b/test/common_system_test.py
@@ -38,7 +38,7 @@ def test_install_icon(version):
 # Error: Type mismatch in argument 'size_dummy' at (1); passed INTEGER(8) to INTEGER(4) cdi_write_f2003.f90:31:37
 def test_install_icontools():
     spack_install(
-        "icontools @c2sm-master %gcc ~mpi ^netcdf-fortran%gcc", test_root=False
+        "icontools @c2sm-master %nvhpc ~mpi ^netcdf-fortran%gcc", test_root=False
     )