diff --git a/include/wine/debug.h b/include/wine/debug.h
index 18de4518be9..152956d646b 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -196,19 +196,32 @@ static inline const char *wine_dbgstr_guid( const GUID *id )
 static inline const char *wine_dbgstr_point( const POINT *pt )
 {
     if (!pt) return "(null)";
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
     return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y );
+#else
+    return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y );
+#endif
 }
 
 static inline const char *wine_dbgstr_size( const SIZE *size )
 {
     if (!size) return "(null)";
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
     return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy );
+#else
+    return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy );
+#endif
 }
 
 static inline const char *wine_dbgstr_rect( const RECT *rect )
 {
     if (!rect) return "(null)";
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
     return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom );
+#else
+    return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top,
+                             rect->right, rect->bottom );
+#endif
 }
 
 static inline const char *wine_dbgstr_longlong( ULONGLONG ll )
diff --git a/include/wine/test.h b/include/wine/test.h
index 8e2bc628674..8ef8a31a396 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -371,7 +371,11 @@ static int run_test( const char *name )
 
     if (winetest_debug)
     {
+#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
         fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
+#else
+        fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n",
+#endif
                  name, successes + failures + todo_successes + todo_failures,
                  todo_successes, failures + todo_failures,
                  (failures + todo_failures != 1) ? "failures" : "failure" );