diff --git a/tests/src/unit-bson.cpp b/tests/src/unit-bson.cpp
index a231c8cc..0dc40053 100644
--- a/tests/src/unit-bson.cpp
+++ b/tests/src/unit-bson.cpp
@@ -865,7 +865,7 @@ TEST_CASE("BSON numerical data")
             {
                 std::vector<int64_t> numbers
                 {
-                    INT64_MIN,
+                    std::numeric_limits<int64_t>::min() /* INT64_MIN */,
                     -1000000000000000000LL,
                     -100000000000000000LL,
                     -10000000000000000LL,
@@ -875,7 +875,7 @@ TEST_CASE("BSON numerical data")
                     -1000000000000LL,
                     -100000000000LL,
                     -10000000000LL,
-                    static_cast<std::int64_t>(INT32_MIN) - 1,
+                    static_cast<std::int64_t>(std::numeric_limits<int32_t>::min() /* INT32_MIN */) - 1,
                 };
 
                 for (auto i : numbers)
@@ -923,7 +923,7 @@ TEST_CASE("BSON numerical data")
             {
                 std::vector<int32_t> numbers
                 {
-                    INT32_MIN,
+                    std::numeric_limits<int32_t>::min() /* INT32_MIN */,
                     -2147483647L,
                     -1000000000L,
                     -100000000L,
@@ -947,7 +947,7 @@ TEST_CASE("BSON numerical data")
                     100000000L,
                     1000000000L,
                     2147483646L,
-                    INT32_MAX
+                    std::numeric_limits<int32_t>::max() /* INT32_MAX */
                 };
 
                 for (auto i : numbers)
@@ -990,7 +990,7 @@ TEST_CASE("BSON numerical data")
             {
                 std::vector<int64_t> numbers
                 {
-                    INT64_MAX,
+                    std::numeric_limits<int64_t>::max() /* INT64_MAX */,
                     1000000000000000000LL,
                     100000000000000000LL,
                     10000000000000000LL,
@@ -1000,7 +1000,7 @@ TEST_CASE("BSON numerical data")
                     1000000000000LL,
                     100000000000LL,
                     10000000000LL,
-                    static_cast<std::int64_t>(INT32_MAX) + 1,
+                    static_cast<std::int64_t>(std::numeric_limits<int32_t>::max() /* INT32_MAX */) + 1,
                 };
 
                 for (auto i : numbers)
@@ -1062,7 +1062,7 @@ TEST_CASE("BSON numerical data")
                     100000000ULL,
                     1000000000ULL,
                     2147483646ULL,
-                    static_cast<std::uint64_t>(INT32_MAX)
+                    static_cast<std::uint64_t>(std::numeric_limits<int32_t>::max() /* INT32_MAX */)
                 };
 
                 for (auto i : numbers)
@@ -1105,9 +1105,9 @@ TEST_CASE("BSON numerical data")
             {
                 std::vector<std::uint64_t> numbers
                 {
-                    static_cast<std::uint64_t>(INT32_MAX) + 1,
+                    static_cast<std::uint64_t>(std::numeric_limits<int32_t>::max() /* INT32_MAX */) + 1,
                     4000000000ULL,
-                    static_cast<std::uint64_t>(UINT32_MAX),
+                    static_cast<std::uint64_t>(std::numeric_limits<uint32_t>::max() /* UINT32_MAX */),
                     10000000000ULL,
                     100000000000ULL,
                     1000000000000ULL,
@@ -1117,7 +1117,7 @@ TEST_CASE("BSON numerical data")
                     10000000000000000ULL,
                     100000000000000000ULL,
                     1000000000000000000ULL,
-                    static_cast<std::uint64_t>(INT64_MAX),
+                    static_cast<std::uint64_t>(std::numeric_limits<int64_t>::max() /* INT64_MAX */),
                 };
 
                 for (auto i : numbers)
@@ -1163,11 +1163,11 @@ TEST_CASE("BSON numerical data")
             {
                 std::vector<std::uint64_t> numbers
                 {
-                    static_cast<std::uint64_t>(INT64_MAX) + 1ULL,
+                    static_cast<std::uint64_t>(std::numeric_limits<int64_t>::max() /* INT64_MAX */) + 1ULL,
                     10000000000000000000ULL,
                     18000000000000000000ULL,
-                    UINT64_MAX - 1ULL,
-                    UINT64_MAX,
+                    std::numeric_limits<uint64_t>::max() /* UINT64_MAX */ - 1ULL,
+                    std::numeric_limits<uint64_t>::max() /* UINT64_MAX */ ,
                 };
 
                 for (auto i : numbers)
diff --git a/tests/src/unit-cbor.cpp b/tests/src/unit-cbor.cpp
index ffa3e92d..e8981ecf 100644
--- a/tests/src/unit-cbor.cpp
+++ b/tests/src/unit-cbor.cpp
@@ -173,7 +173,7 @@ TEST_CASE("CBOR")
                 SECTION("-9223372036854775808..-4294967297")
                 {
                     std::vector<int64_t> numbers;
-                    numbers.push_back(INT64_MIN);
+                    numbers.push_back(std::numeric_limits<int64_t>::min() /* INT64_MIN */);
                     numbers.push_back(-1000000000000000000);
                     numbers.push_back(-100000000000000000);
                     numbers.push_back(-10000000000000000);
diff --git a/tests/src/unit-msgpack.cpp b/tests/src/unit-msgpack.cpp
index 0f7aab8d..91792676 100644
--- a/tests/src/unit-msgpack.cpp
+++ b/tests/src/unit-msgpack.cpp
@@ -508,7 +508,7 @@ TEST_CASE("MessagePack")
                 SECTION("-9223372036854775808..-2147483649 (int 64)")
                 {
                     std::vector<int64_t> numbers;
-                    numbers.push_back(INT64_MIN);
+                    numbers.push_back(std::numeric_limits<int64_t>::min() /* INT64_MIN */);
                     numbers.push_back(-2147483649LL);
                     for (auto i : numbers)
                     {
diff --git a/tests/src/unit-regression1.cpp b/tests/src/unit-regression1.cpp
index ee7f8bc1..a2d55674 100644
--- a/tests/src/unit-regression1.cpp
+++ b/tests/src/unit-regression1.cpp
@@ -877,12 +877,12 @@ TEST_CASE("regression tests 1")
         // original test case
         json j1 = json::parse("-9223372036854775808");
         CHECK(j1.is_number_integer());
-        CHECK(j1.get<json::number_integer_t>() == INT64_MIN);
+        CHECK(j1.get<json::number_integer_t>() == std::numeric_limits<int64_t>::min() /* INT64_MIN */);
 
         // edge case (+1; still an integer)
         json j2 = json::parse("-9223372036854775807");
         CHECK(j2.is_number_integer());
-        CHECK(j2.get<json::number_integer_t>() == INT64_MIN + 1);
+        CHECK(j2.get<json::number_integer_t>() == std::numeric_limits<int64_t>::min() /* INT64_MIN */ + 1);
 
         // edge case (-1; overflow -> floats)
         json j3 = json::parse("-9223372036854775809");
diff --git a/tests/src/unit-to_chars.cpp b/tests/src/unit-to_chars.cpp
index 0d5fcd42..7d45b597 100644
--- a/tests/src/unit-to_chars.cpp
+++ b/tests/src/unit-to_chars.cpp
@@ -463,8 +463,8 @@ TEST_CASE("formatting")
         };
 
         // edge cases
-        check_integer(INT64_MIN, "-9223372036854775808");
-        check_integer(INT64_MAX, "9223372036854775807");
+        check_integer(std::numeric_limits<int64_t>::min() /* INT64_MIN */, "-9223372036854775808");
+        check_integer(std::numeric_limits<int64_t>::max() /* INT64_MAX */, "9223372036854775807");
 
         // few random big integers
         check_integer(-3456789012345678901LL, "-3456789012345678901");