diff --git a/unittest/force-styles/test_error_stats.cpp b/unittest/force-styles/test_error_stats.cpp
index 52ba3baae3..cadb4e7f2a 100644
--- a/unittest/force-styles/test_error_stats.cpp
+++ b/unittest/force-styles/test_error_stats.cpp
@@ -9,6 +9,11 @@
 #include "fmtlib_format.cpp"
 #include "fmtlib_os.cpp"
 
+// Windows may define this as a macro
+#if defined(max)
+#undef max
+#endif
+
 TEST(ErrorStats, test)
 {
     ErrorStats stats;
diff --git a/unittest/utils/test_math_eigen_impl.cpp b/unittest/utils/test_math_eigen_impl.cpp
index 895a35080c..47ca8d9cca 100644
--- a/unittest/utils/test_math_eigen_impl.cpp
+++ b/unittest/utils/test_math_eigen_impl.cpp
@@ -48,7 +48,7 @@ inline static bool SimilarVec(Vector a, Vector b, int n, Scalar eps = 1.0e-06,
                               Scalar ratio = 1.0e-06, Scalar ratio_denom = 1.0)
 {
     for (int i = 0; i < n; i++)
-        if (not Similar(a[i], b[i], eps, ratio, ratio_denom)) return false;
+        if (! Similar(a[i], b[i], eps, ratio, ratio_denom)) return false;
     return true;
 }
 
@@ -61,7 +61,7 @@ inline static bool SimilarVecUnsigned(Vector a, Vector b, int n, Scalar eps = 1.
         return true;
     else {
         for (int i = 0; i < n; i++)
-            if (not Similar(a[i], -b[i], eps, ratio, ratio_denom)) return false;
+            if (! Similar(a[i], -b[i], eps, ratio, ratio_denom)) return false;
         return true;
     }
 }