diff --git a/test/main.F90 b/test/main.F90
index 01dadd42..3a001461 100644
--- a/test/main.F90
+++ b/test/main.F90
@@ -20,12 +20,10 @@ program main
   use prif_co_min_test_m, only : prif_co_min_test_t
   use prif_co_reduce_test_m, only : prif_co_reduce_test_t
   use prif_co_sum_test_m, only : prif_co_sum_test_t
-  !use prif_error_stop_test_m, only : prif_error_stop_test_t
   use prif_image_index_test_m, only : prif_image_index_test_t
   use prif_init_test_m, only : prif_init_test_t
   use prif_num_images_test_m, only : prif_num_images_test_t
   use prif_rma_test_m, only : prif_rma_test_t
-  !use prif_stop_test_m, only : prif_stop_test_t
   use prif_teams_test_m, only : prif_teams_test_t
   use prif_this_image_test_m, only : prif_this_image_test_t
   implicit none
@@ -77,8 +75,6 @@ subroutine run_tests_and_report(passes, tests)
     type(prif_rma_test_t) prif_rma_test
     type(prif_teams_test_t) prif_teams_test
     type(prif_this_image_test_t) prif_this_image_test
-    !type(prif_error_stop_test_t) prif_error_stop_test
-    !type(prif_stop_test_t) prif_stop_test
 
     call prif_init_test%report(passes, tests) ! This test must run first
     call prif_allocate_test%report(passes, tests)
@@ -92,21 +88,6 @@ subroutine run_tests_and_report(passes, tests)
     call prif_teams_test%report(passes, tests)
     call prif_this_image_test%report(passes, tests)
     call prif_rma_test%report(passes, tests)
-    !call prif_stop_test%report(passes, tests)
-    !call prif_error_stop_test%report(passes, tests)
-!#ifdef __flang__
-    !print *
-    !print *,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-    !print *
-    !print *,"LLVM Flang detected. Skipping tests that crash:"
-    !print *,"  - prif_co_max_test"
-    !print *,"  - prif_co_min_test"
-    !print *,"  - prif_co_reduce_test"
-    !print *,"  - prif_co_sum_test"
-    !print *,"  - prif_image_index_test"
-    !print *
-    !print *,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-!#endif
 
   end subroutine run_tests_and_report