diff --git a/test/cstdint_test.cpp b/test/cstdint_test.cpp
index 2ee450a..9c40d3d 100644
--- a/test/cstdint_test.cpp
+++ b/test/cstdint_test.cpp
@@ -220,5 +220,5 @@ int main(int, char*[])
 
 
   std::cout << "OK\n";
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/integer_mask_test.cpp b/test/integer_mask_test.cpp
index e54c031..4c1bb4b 100644
--- a/test/integer_mask_test.cpp
+++ b/test/integer_mask_test.cpp
@@ -119,5 +119,5 @@ int main( int, char*[] )
     PRIVATE_LOW_BITS_TEST(  2 );
     PRIVATE_LOW_BITS_TEST(  1 );
 
-    return boost::exit_success;
+    return boost::report_errors();
 }
diff --git a/test/integer_test.cpp b/test/integer_test.cpp
index c709282..e7dbbe4 100644
--- a/test/integer_test.cpp
+++ b/test/integer_test.cpp
@@ -247,5 +247,5 @@ int main(int, char*[])
       test_min_max_type<boost::int_min_value_t<_LLONG_MIN>, long long>(_LLONG_MIN);
       test_min_max_type<boost::uint_value_t<_ULLONG_MAX>, unsigned long long>(_ULLONG_MAX);
 #endif
-      return 0;
+      return boost::report_errors();
 }
diff --git a/test/integer_traits_test.cpp b/test/integer_traits_test.cpp
index 701764b..9c5fcd0 100644
--- a/test/integer_traits_test.cpp
+++ b/test/integer_traits_test.cpp
@@ -96,6 +96,6 @@ int main(int, char*[])
 #endif
   // Some compilers don't pay attention to std:3.6.1/5 and issue a
   // warning here if "return 0;" is omitted.
-  return 0;
+  return boost::report_errors();
 }
 
diff --git a/test/static_log2_test.cpp b/test/static_log2_test.cpp
index 5dba689..f92d801 100644
--- a/test/static_log2_test.cpp
+++ b/test/static_log2_test.cpp
@@ -145,5 +145,5 @@ main
     PRIVATE_LB_TEST( 65536, 16 );
     PRIVATE_LB_TEST( 65537, 16 );
 
-    return boost::exit_success;
+    return boost::report_errors();
 }
diff --git a/test/static_min_max_test.cpp b/test/static_min_max_test.cpp
index 37ea6bd..124e137 100644
--- a/test/static_min_max_test.cpp
+++ b/test/static_min_max_test.cpp
@@ -88,5 +88,5 @@ main
     BOOST_TEST( (static_signed_min< -101, -101>::value) == -101 );
     BOOST_TEST( (static_signed_max< -101, -101>::value) == -101 );
 
-    return boost::exit_success;
+    return boost::report_errors();
 }