diff --git a/rostests/winetests/gdiplus/font.c b/rostests/winetests/gdiplus/font.c
index c4f7dbe9d10..452383c88f5 100644
--- a/rostests/winetests/gdiplus/font.c
+++ b/rostests/winetests/gdiplus/font.c
@@ -101,7 +101,6 @@ static void test_createfont(void)
     GdipDeleteFontFamily(fontfamily);
 }
 
-#if CORE_6660_IS_FIXED
 static void test_logfont(void)
 {
     LOGFONTA lfa, lfa2;
@@ -283,7 +282,6 @@ static void test_fontfamily (void)
 
     GdipDeleteFontFamily(clonedFontFamily);
 }
-#endif // CORE_6660_IS_FIXED
 
 static void test_fontfamily_properties (void)
 {
@@ -495,7 +493,6 @@ static void test_heightgivendpi(void)
     GdipDeleteFontFamily(fontfamily);
 }
 
-#if CORE_6660_IS_FIXED
 static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme,
                                    DWORD type, LPARAM lparam)
 {
@@ -732,7 +729,6 @@ static void test_font_metrics(void)
     GdipDeleteGraphics(graphics);
     DeleteDC(hdc);
 }
-#endif // CORE_6660_IS_FIXED
 
 static void test_font_substitution(void)
 {
@@ -1117,15 +1113,14 @@ START_TEST(font)
     GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
 
     test_font_transform();
-    test_font_substitution();
-#if CORE_6660_IS_FIXED
+    if (!winetest_interactive)
+        skip("ROSTESTS-154: Skipping test_font_substitution because of improper error handling\n");
+    else
+        test_font_substitution();
     test_font_metrics();
-#endif
     test_createfont();
-#if CORE_6660_IS_FIXED
     test_logfont();
     test_fontfamily();
-#endif
     test_fontfamily_properties();
     test_getgenerics();
     test_installedfonts();