diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b85cfcc8e9..c359bdd7c58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,8 @@ if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTING)
     add_subdirectory(ParameterLib)
     add_subdirectory(MaterialLib)
     add_subdirectory(ProcessLib)
+endif()
+if(TARGET OgsXdmf)
     add_subdirectory(Tests/xdmfdiff)
 endif()
 if(OGS_BUILD_TESTING AND PROJECT_IS_TOP_LEVEL)
diff --git a/ThirdParty/collection b/ThirdParty/collection
index a6070238d6c..5d836e0b9b9 160000
--- a/ThirdParty/collection
+++ b/ThirdParty/collection
@@ -1 +1 @@
-Subproject commit a6070238d6c9561a1fac03c93b1f20f248683155
+Subproject commit 5d836e0b9b9dc9fd312593ea52664b01be43756f
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 0e9b026ebeb..678c2d09984 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -332,7 +332,7 @@ if(OGS_USE_PETSC)
     endif()
 endif()
 
-if(OGS_BUILD_TESTING OR OGS_BUILD_CLI OR OGS_BUILD_UTILS)
+if((OGS_BUILD_TESTING OR OGS_BUILD_UTILS) AND NOT GUIX_BUILD)
     set(XDMF_LIBNAME OgsXdmf CACHE STRING "")
     CPMAddPackage(
         NAME xdmf