diff --git a/lib/setup.h b/lib/setup.h
index dcd021851..9cf3d8f31 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -135,22 +135,12 @@
    Error Compilation_aborted_FORMAT_OFF_TU_already_defined
 #endif
 
-#if (CURL_SIZEOF_CURL_OFF_T > 4)
-#  if (CURL_SIZEOF_LONG > 4)
-#    define FORMAT_OFF_T  "ld"
-#    define FORMAT_OFF_TU "lu"
-#  else
-#    define FORMAT_OFF_T  "lld"
-#    define FORMAT_OFF_TU "llu"
-#  endif
+#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)
+#  define FORMAT_OFF_T  "lld"
+#  define FORMAT_OFF_TU "llu"
 #else
-#  if (CURL_SIZEOF_LONG > 2)
-#    define FORMAT_OFF_T  "ld"
-#    define FORMAT_OFF_TU "lu"
-#  else
-#    define FORMAT_OFF_T  "lld"
-#    define FORMAT_OFF_TU "llu"
-#  endif
+#  define FORMAT_OFF_T  "ld"
+#  define FORMAT_OFF_TU "lu"
 #endif
 
 /*
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index 1242e6b9d..c70155e95 100644
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -18,20 +18,13 @@
 int curl_msprintf(char *buffer, const char *format, ...);
 
 
-#if (CURL_SIZEOF_CURL_OFF_T > 4)
-#  if (CURL_SIZEOF_LONG > 4)
-#    define MPRNT_SUFFIX_CURL_OFF_T  L
-#  else
-#    define MPRNT_SUFFIX_CURL_OFF_T  LL
-#  endif
+#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)
+#  define MPRNT_SUFFIX_CURL_OFF_T  LL
 #else
-#  if (CURL_SIZEOF_LONG > 2)
-#    define MPRNT_SUFFIX_CURL_OFF_T  L
-#  else
-#    define MPRNT_SUFFIX_CURL_OFF_T  LL
-#  endif
+#  define MPRNT_SUFFIX_CURL_OFF_T  L
 #endif
 
+
 #ifdef CURL_ISOCPP
 #  define MPRNT_OFF_T_C_HELPER2(Val,Suffix) Val ## Suffix
 #else