diff --git a/cfg/std.cfg b/cfg/std.cfg
index dfb4acddcf4..6cd0c371a5e 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -3,16 +3,16 @@
   <!-- stdint.h -->
   <define name="INT8_MIN" value="-128"/>
   <define name="INT16_MIN" value="-32768"/>
-  <define name="INT32_MIN" value="-2147483648"/>
-  <define name="INT64_MIN" value="(-9223372036854775807L-1)"/>
+  <define name="INT32_MIN" value="(-2147483647-1)"/>
+  <define name="INT64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_FAST8_MIN" value="-128"/>
-  <define name="INT_FAST16_MIN" value="(-9223372036854775807L-1)"/>
-  <define name="INT_FAST32_MIN" value="(-9223372036854775807L-1)"/>
-  <define name="INT_FAST64_MIN" value="(-9223372036854775807L-1)"/>
+  <define name="INT_FAST16_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST32_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_LEAST8_MIN" value="-128"/>
   <define name="INT_LEAST16_MIN" value="-32768"/>
-  <define name="INT_LEAST32_MIN" value="-2147483648"/>
-  <define name="INT_LEAST64_MIN" value="(-9223372036854775807L-1)"/>
+  <define name="INT_LEAST32_MIN" value="(-2147483647-1)"/>
+  <define name="INT_LEAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT8_MAX" value="127"/>
   <define name="INT16_MAX" value="32767"/>
   <define name="INT32_MAX" value="2147483647"/>
diff --git a/test/cfg/std.c b/test/cfg/std.c
index b96f1bf8317..adc147c2333 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -38,6 +38,17 @@
 #include <math.h>
 #include <stddef.h>
 
+void test_int32_min() {
+    // cppcheck-suppress shiftNegativeLHS
+    // cppcheck-suppress shiftTooManyBits ; tests that INT32_MIN is a 32-bit expression (not 64-bit expression)
+    (void)(INT32_MIN >> 40);
+}
+
+void test_int64_min() {
+    // cppcheck-suppress compareValueOutOfTypeRangeError ; tests that INT64_MIN is a signed expression
+    if (INT64_MIN < 0) {}
+}
+
 size_t invalidFunctionArgStr_wcslen(void)
 {
     const wchar_t terminated0[] = L"ABCDEF49620910";