diff --git a/src/swiftest/swiftest_driver.f90 b/src/swiftest/swiftest_driver.f90
index 7b8f103d9..81f1c8c17 100644
--- a/src/swiftest/swiftest_driver.f90
+++ b/src/swiftest/swiftest_driver.f90
@@ -190,5 +190,11 @@ program swiftest_driver
          
    end associate
 
-   call base_util_exit(SUCCESS)
+#ifdef COARRAY
+   if (this_image() == 1) then
+#endif
+      call base_util_exit(SUCCESS)
+#ifdef COARRAY
+   end if ! (this_image() == 1) 
+#endif
 end program swiftest_driver