diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake
index fe155dc89a04cf5e3990c3c5b48cede59bf928da..888ea98ef18b79a57c83cceb7a5f53e4e25fa420 100644
--- a/CI/main_superbuild.cmake
+++ b/CI/main_superbuild.cmake
@@ -134,7 +134,7 @@ ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}"
 
 if ( NOT _configure_rv EQUAL 0 )
   ctest_submit()
-  message( SEND_ERROR "An error occurs during ctest_configure.")
+  message( FATAL_ERROR "An error occurs during ctest_configure.")
 endif()
 
 ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
@@ -143,24 +143,17 @@ ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
             )
 
 if ( NOT _build_rv EQUAL 0 )
-  ctest_submit()
   message( SEND_ERROR "An error occurs during ctest_build.")
 endif()
 
 # Uncomment when ready for test
-# ctest_test(PARALLEL_LEVEL 8
-#            RETURN_VALUE _test_rv
-#            CAPTURE_CMAKE_ERROR _test_error
-#            )
-
-# if ( NOT _test_rv EQUAL 0 )
-#   ctest_submit()
-#   message( SEND_ERROR "An error occurs during ctest_test.")
-# endif()
-
-ctest_test(
-  BUILD "${CTEST_BINARY_DIRECTORY}"
-  PARALLEL_LEVEL 4
-  )
+ctest_test(PARALLEL_LEVEL 8
+           RETURN_VALUE _test_rv
+           CAPTURE_CMAKE_ERROR _test_error
+           )
+
+if ( NOT _test_rv EQUAL 0 )
+  message( SEND_ERROR "An error occurs during ctest_test.")
+endif()
 
 ctest_submit()