diff --git a/.ci/bb/mistral-dkrz/test.icon-pio.nag-6.2.6223 b/.ci/bb/mistral-dkrz/test.icon-pio.nag-6.2.6223
index 4b6608b1660ae28e530010e6025cc6160cbebe0c..bb7797302a5f0308221db7b9126c3d453564c05e 100755
--- a/.ci/bb/mistral-dkrz/test.icon-pio.nag-6.2.6223
+++ b/.ci/bb/mistral-dkrz/test.icon-pio.nag-6.2.6223
@@ -35,8 +35,12 @@ export PATH="${WRONG_NETCDF_ROOT}/bin:${PATH-}"
 export LD_LIBRARY_PATH="${MPICH_ROOT}/lib:${NETCDF_ROOT}/lib:${ECCODES_ROOT}/lib:${LD_LIBRARY_PATH}"
 
 "${top_srcdir}/configure" \
+--disable-across \
 --disable-cdi-app \
 --disable-maintainer-mode \
+--disable-openmp \
+--disable-python-interface \
+--disable-ruby-interface \
 --disable-shared \
 --enable-cf-interface=yes \
 --enable-cgribex \
@@ -49,10 +53,24 @@ export LD_LIBRARY_PATH="${MPICH_ROOT}/lib:${NETCDF_ROOT}/lib:${ECCODES_ROOT}/lib
 --with-eccodes=yes \
 --with-netcdf \
 --with-on-demand-check-programs \
+--without-dce-uuid \
 --without-example-programs \
+--without-fdb5 \
 --without-grib-api \
+--without-ossp-uuid \
 --without-szlib \
 --without-threads \
+--without-util-linux-uuid \
+BUILD_CC= \
+BUILD_CFLAGS= \
+BUILD_CXX= \
+BUILD_F77= \
+BUILD_FC= \
+BUILD_FCFLAGS= \
+BUILD_LDFLAGS= \
+BUILD_LIBS= \
+BUILD_MPI_C_LIB= \
+BUILD_MPI_FC_LIB= \
 CC="${CC}" \
 CFLAGS='-g -march=native -O2' \
 CPPFLAGS="-I${MPICH_ROOT}/include -I${NETCDF_ROOT}/include -I${ECCODES_ROOT}/include" \
@@ -71,13 +89,13 @@ MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG= \
 PPM_CORE_C_INCLUDE= \
 PPM_CORE_C_LIB= \
+UUID_C_INCLUDE= \
+UUID_C_LIB= \
 YAXT_C_INCLUDE= \
 YAXT_C_LIB= \
 YAXT_FC_LIB= \
 YAXT_FC_MOD= \
-ac_cv_func_uuid_create=no \
 ac_cv_header_ppm_dist_array_h=yes \
-ac_cv_lib_uuid_uuid_generate=no \
 acx_cv_c_include_ppm_ppm_h="-I${LOCAL_PPM_ROOT}/include" \
 acx_cv_c_include_yaxt_h="-I${LOCAL_YAXT_ROOT}/include" \
 acx_cv_fortran_mod_yaxt="-I${LOCAL_YAXT_ROOT}/include" \
diff --git a/.ci/bb/mistral-dkrz/test.icon.gcc-6.4.0 b/.ci/bb/mistral-dkrz/test.icon.gcc-6.4.0
index d35caa0fa2a26b6a2defb819ec65713c4464ed79..015f4d0674d6acc43cc08e872eaeab9e1a6b8b53 100755
--- a/.ci/bb/mistral-dkrz/test.icon.gcc-6.4.0
+++ b/.ci/bb/mistral-dkrz/test.icon.gcc-6.4.0
@@ -14,8 +14,12 @@ test -f "${top_srcdir}/configure" || "${top_srcdir}/autogen.sh"
 export LD_LIBRARY_PATH="${NETCDF_ROOT}/lib:${GRIBAPI_ROOT}/lib:${LD_LIBRARY_PATH-}"
 
 "${top_srcdir}/configure" \
+--disable-across \
 --disable-cdi-app \
 --disable-maintainer-mode \
+--disable-openmp \
+--disable-python-interface \
+--disable-ruby-interface \
 --disable-shared \
 --enable-cf-interface=no \
 --enable-cgribex \
@@ -28,10 +32,24 @@ export LD_LIBRARY_PATH="${NETCDF_ROOT}/lib:${GRIBAPI_ROOT}/lib:${LD_LIBRARY_PATH
 --with-eccodes=yes \
 --with-netcdf \
 --with-on-demand-check-programs \
+--without-dce-uuid \
 --without-example-programs \
+--without-fdb5 \
 --without-grib_api \
+--without-ossp-uuid \
 --without-szlib \
 --without-threads \
+--without-util-linux-uuid \
+BUILD_CC= \
+BUILD_CFLAGS= \
+BUILD_CXX= \
+BUILD_F77= \
+BUILD_FC= \
+BUILD_FCFLAGS= \
+BUILD_LDFLAGS= \
+BUILD_LIBS= \
+BUILD_MPI_C_LIB= \
+BUILD_MPI_FC_LIB= \
 CC="${MPICC}" \
 CFLAGS='-g -march=native -mpc64 -O2' \
 CPPFLAGS="-I${NETCDF_ROOT}/include -I${GRIBAPI_ROOT}/include" \
@@ -50,12 +68,12 @@ MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG= \
 PPM_CORE_C_INCLUDE= \
 PPM_CORE_C_LIB= \
+UUID_C_INCLUDE= \
+UUID_C_LIB= \
 YAXT_C_INCLUDE= \
 YAXT_C_LIB= \
 YAXT_FC_LIB= \
 YAXT_FC_MOD= \
-ac_cv_func_uuid_create=no \
-ac_cv_lib_uuid_uuid_generate=no \
 acx_cv_have_libnc_dap=no \
 acx_cv_have_nc4hdf5=no \
 acx_cv_have_netcdf2=yes \