diff --git a/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff b/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff
new file mode 100644
index 00000000000..014961d9a89
--- /dev/null
+++ b/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff
@@ -0,0 +1,30 @@
+Index: graphics.c
+===================================================================
+--- graphics.c  (revision 57206)
++++ graphics.c  (working copy)
+@@ -2819,6 +2819,7 @@
+     ReleaseDC(hwnd, hdc);
+ }
+
++#if CORE_6659_IS_FIXED
+ static void test_string_functions(void)
+ {
+     GpStatus status;
+@@ -3138,6 +3139,7 @@
+
+     ReleaseDC(hwnd, hdc);
+ }
++#endif /* CORE_6659_IS_FIXED */
+
+ static void test_get_set_interpolation(void)
+ {
+@@ -3361,7 +3363,9 @@
+     test_clear();
+     test_textcontrast();
+     test_fromMemoryBitmap();
++#if CORE_6659_IS_FIXED
+     test_string_functions();
++#endif
+     test_get_set_interpolation();
+     test_get_set_textrenderinghint();
+     test_getdc_scaled();
diff --git a/rostests/winetests/gdiplus/graphics.c b/rostests/winetests/gdiplus/graphics.c
index 0d313658195..453773ca0b2 100644
--- a/rostests/winetests/gdiplus/graphics.c
+++ b/rostests/winetests/gdiplus/graphics.c
@@ -2819,6 +2819,7 @@ static void test_GdipGetNearestColor(void)
     ReleaseDC(hwnd, hdc);
 }
 
+#if CORE_6659_IS_FIXED
 static void test_string_functions(void)
 {
     GpStatus status;
@@ -3138,6 +3139,7 @@ static void test_string_functions(void)
 
     ReleaseDC(hwnd, hdc);
 }
+#endif /* CORE_6659_IS_FIXED */
 
 static void test_get_set_interpolation(void)
 {
@@ -3361,7 +3363,9 @@ START_TEST(graphics)
     test_clear();
     test_textcontrast();
     test_fromMemoryBitmap();
+#if CORE_6659_IS_FIXED
     test_string_functions();
+#endif
     test_get_set_interpolation();
     test_get_set_textrenderinghint();
     test_getdc_scaled();