diff --git a/counting_iterator_test.cpp b/counting_iterator_test.cpp
index 62f1e57..5aa6c53 100644
--- a/counting_iterator_test.cpp
+++ b/counting_iterator_test.cpp
@@ -240,7 +240,7 @@ int main()
     test_integer<unsigned int>();
     test_integer<long>();
     test_integer<unsigned long>();
-#if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX)
+#if defined(BOOST_HAS_LONG_LONG)
     test_integer<long long>();
     test_integer<unsigned long long>();
 #endif
diff --git a/half_open_range_test.cpp b/half_open_range_test.cpp
index 04c2e97..b19b4db 100644
--- a/half_open_range_test.cpp
+++ b/half_open_range_test.cpp
@@ -346,7 +346,7 @@ int main()
     test_integer<unsigned int>();
     test_integer<long>();
     test_integer<unsigned long>();
-#if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX)
+#if defined(BOOST_HAS_LONG_LONG)
     test_integer<long long>();
     test_integer<unsigned long long>();
 #endif