diff --git a/cpp/testCalibratedCamera.cpp b/cpp/testCalibratedCamera.cpp
index 450b5513f..c48fb10ea 100644
--- a/cpp/testCalibratedCamera.cpp
+++ b/cpp/testCalibratedCamera.cpp
@@ -110,7 +110,7 @@ TEST( CalibratedCamera, Dproject_point_pose)
 }
 
 /* ************************************************************************* */
-int main() { TestResult tr; TestRegistry::runAllTests(tr); return 0; }
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */
 
 
diff --git a/cpp/testSimpleCamera.cpp b/cpp/testSimpleCamera.cpp
index cb580f458..f7f4d16a6 100644
--- a/cpp/testSimpleCamera.cpp
+++ b/cpp/testSimpleCamera.cpp
@@ -91,7 +91,7 @@ TEST( SimpleCamera, Dproject_point_pose)
 }
 
 /* ************************************************************************* */
-int main() { TestResult tr; TestRegistry::runAllTests(tr); return 0; }
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */
 
 
diff --git a/cpp/testVSLAMFactor.cpp b/cpp/testVSLAMFactor.cpp
index 471e77ba0..2927054d4 100644
--- a/cpp/testVSLAMFactor.cpp
+++ b/cpp/testVSLAMFactor.cpp
@@ -92,10 +92,6 @@ TEST( ProjectionFactor, equals )
 }
 
 /* ************************************************************************* */
-int main() {
-	TestResult tr;
-	TestRegistry::runAllTests(tr);
-	return 0;
-}
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */
 
diff --git a/cpp/testVSLAMGraph.cpp b/cpp/testVSLAMGraph.cpp
index a15693eeb..1756f4465 100644
--- a/cpp/testVSLAMGraph.cpp
+++ b/cpp/testVSLAMGraph.cpp
@@ -195,5 +195,5 @@ TEST( Graph, CHECK_ORDERING)
 }
 
 /* ************************************************************************* */
-int main() { TestResult tr; TestRegistry::runAllTests(tr); return 0;}
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */
diff --git a/cpp/timeGaussianFactorGraph.cpp b/cpp/timeGaussianFactorGraph.cpp
index 8ac11fc11..192a37231 100644
--- a/cpp/timeGaussianFactorGraph.cpp
+++ b/cpp/timeGaussianFactorGraph.cpp
@@ -237,9 +237,5 @@ TEST(timeGaussianFactorGraph, planar_join_new)
 
 
 /* ************************************************************************* */
-int main() {
-	TestResult tr;
-	TestRegistry::runAllTests(tr);
-	return 0;
-}
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */
diff --git a/wrap/testSpirit.cpp b/wrap/testSpirit.cpp
index 307cb452d..8243b8285 100644
--- a/wrap/testSpirit.cpp
+++ b/wrap/testSpirit.cpp
@@ -90,5 +90,5 @@ TEST( spirit, constMethod_p ) {
 }
 
 /* ************************************************************************* */
-int main() { TestResult tr; TestRegistry::runAllTests(tr); return 0; }
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */
diff --git a/wrap/testWrap.cpp b/wrap/testWrap.cpp
index 44e7d7ceb..f28e0035f 100644
--- a/wrap/testWrap.cpp
+++ b/wrap/testWrap.cpp
@@ -87,5 +87,5 @@ TEST( wrap, matlab_code ) {
 }
 
 /* ************************************************************************* */
-int main() { TestResult tr; TestRegistry::runAllTests(tr); return 0; }
+int main() { TestResult tr; return TestRegistry::runAllTests(tr); }
 /* ************************************************************************* */