diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
index 488549ca..8196d8f5 100644
--- a/cpp/tests/CMakeLists.txt
+++ b/cpp/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ if(Catch2_FOUND)
   target_link_libraries(common_catch_main_object Catch2::Catch2)
 endif()
 if(EIGEN3_INCLUDE_DIR)
-target_include_directories(common_catch_main_object SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
+  target_include_directories(common_catch_main_object SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
 endif()
 if(sopt_FOUND)
   target_include_directories(common_catch_main_object SYSTEM PUBLIC ${sopt_INCLUDE_DIR})
@@ -50,17 +50,17 @@ endif()
 
 if(PURIFY_MPI)
   add_library(common_mpi_catch_main_object OBJECT "common_mpi_catch_main.cc")
-  target_include_directories(common_mpi_catch_main_object
-    PUBLIC ${PROJECT_BINARY_DIR}/include ${MPI_CXX_INCLUDE_PATH})
   if(Catch2_FOUND)
     target_link_libraries(common_mpi_catch_main_object Catch2::Catch2)
   endif()
-  if(sopt_FOUND)
-    target_include_directories(common_mpi_catch_main_object SYSTEM PUBLIC ${sopt_INCLUDE_DIR})
-  endif()
   if(EIGEN3_INCLUDE_DIR)
     target_include_directories(common_mpi_catch_main_object SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
   endif()
+  if(sopt_FOUND)
+    target_include_directories(common_mpi_catch_main_object SYSTEM PUBLIC ${sopt_INCLUDE_DIR})
+  endif()
+  target_include_directories(common_mpi_catch_main_object
+    PUBLIC ${PROJECT_BINARY_DIR}/include ${MPI_CXX_INCLUDE_PATH})
 
   function(add_mpi_test testname)
     add_catch_test(${testname} COMMON_MAIN common_mpi_catch_main_object NOTEST ${ARGN})
@@ -84,7 +84,7 @@ if(PURIFY_MPI)
   add_mpi_test(mpi_measurement_factory LIBRARIES libpurify)
   add_mpi_test(mpi_measurement_operator LIBRARIES libpurify)
   add_mpi_test(mpi_read_measurements LIBRARIES libpurify)
-  add_catch_test(mpi_utilities LIBRARIES libpurify)
+  add_mpi_test(mpi_utilities LIBRARIES libpurify)
   add_mpi_test(mpi_wavelet_factory LIBRARIES libpurify)
   add_mpi_test(mpi_wide_field_utilities LIBRARIES libpurify)
   add_mpi_test(parallel_mpi_utilities LIBRARIES libpurify)