diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51f020ba57ccfa6f05cd436ab3dcf5d37fb9a729..e370528088bd7aa86d5e66ebe5181850806b07bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,7 @@ set(PUGS_ENABLE_HDF5 AUTO CACHE STRING
 
 if (PUGS_ENABLE_HDF5 MATCHES "^(AUTO|ON)$")
   # May be risky. (make to show pugs build options)
+  set(HDF5_PREFER_PARALLEL TRUE)
   find_package(HDF5)
   if (HDF5_FOUND)
     # HighFive
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 549a9d4e22bb7d7fefb00075926f54fc5875dbcf..26a5dd744413b7dbd52eace2547459092591dc7f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -302,13 +302,3 @@ target_link_libraries (mpi_unit_tests
   ${HIGHFIVE_TARGET}
   stdc++fs
   )
-
-enable_testing()
-
-if(${PUGS_HAS_MPI})
-  set(MPIEXEC_OPTION_FLAGS --oversubscribe)
-  if (NOT "$ENV{GITLAB_CI}" STREQUAL "")
-    set(MPIEXEC_OPTION_FLAGS ${MPIEXEC_OPTION_FLAGS} --allow-run-as-root)
-  endif()
-  set(OptionalCatchTestLauncher ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 3 ${MPIEXEC_OPTION_FLAGS} --path ${PUGS_BINARY_DIR})
-endif()