diff --git a/src/tests/base64.cc b/src/tests/base64.cc
index 410bf04..b23c585 100644
--- a/src/tests/base64.cc
+++ b/src/tests/base64.cc
@@ -135,7 +135,11 @@ int main( int argc, char *argv[] )
     verbose = true;
   }
 
-  test_base64();
-
+  try {
+    test_base64();
+  } catch ( const std::exception &e ) {
+    fprintf( stderr, "Error: %s\r\n", e.what() );
+    return 1;
+  }
   return 0;
 }
diff --git a/src/tests/ocb-aes.cc b/src/tests/ocb-aes.cc
index 4100c4f..60542c2 100644
--- a/src/tests/ocb-aes.cc
+++ b/src/tests/ocb-aes.cc
@@ -544,8 +544,12 @@ int main( int argc, char *argv[] )
     verbose = true;
   }
 
-  test_all_vectors();
-  test_iterative();
-
+  try {
+    test_all_vectors();
+    test_iterative();
+  } catch ( const std::exception &e ) {
+    fprintf( stderr, "Error: %s\r\n", e.what() );
+    return 1;
+  }
   return 0;
 }