diff --git a/test/tests/sawyercoding_test.cpp b/test/tests/sawyercoding_test.cpp
index c7105416c5..5e9120a29a 100644
--- a/test/tests/sawyercoding_test.cpp
+++ b/test/tests/sawyercoding_test.cpp
@@ -1,5 +1,5 @@
 // Make MSVC shut up about M_PI
-#include <math.h>
+#include <cmath>
 
 extern "C" {
 #include "util/sawyercoding.h"
diff --git a/test/tests/tests.cpp b/test/tests/tests.cpp
index bba7cb7be3..4190c4fa39 100644
--- a/test/tests/tests.cpp
+++ b/test/tests/tests.cpp
@@ -6,8 +6,8 @@
 
 int main(int argc, char * * argv)
 { 
-    testing::InitGoogleTest(&argc, argv); 
-    RUN_ALL_TESTS(); 
+    testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
 }
 
 #endif