diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index 9e0048e4fce..661246c8df6 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -185,7 +185,7 @@ static void test_GdiConvertToDevmodeW(void)
     pGdiConvertToDevmodeW = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GdiConvertToDevmodeW");
     if (!pGdiConvertToDevmodeW)
     {
-        skip("GdiConvertToDevmodeW is not available on this platform\n");
+        win_skip("GdiConvertToDevmodeW is not available on this platform\n");
         return;
     }
 
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 041a7423881..cc5e3f5ae6a 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -839,7 +839,7 @@ static void test_GdiGetCharDimensions(void)
 
     if (!pGdiGetCharDimensions)
     {
-        skip("GdiGetCharDimensions not available on this platform\n");
+        win_skip("GdiGetCharDimensions not available on this platform\n");
         return;
     }
 
@@ -879,7 +879,7 @@ static void test_GetCharABCWidths(void)
 
     if (!pGetCharABCWidthsW || !pGetCharABCWidthsI)
     {
-        skip("GetCharABCWidthsW/I not available on this platform\n");
+        win_skip("GetCharABCWidthsW/I not available on this platform\n");
         return;
     }
 
@@ -944,7 +944,7 @@ static void test_text_extents(void)
     GetTextExtentExPointW(hdc, wt, 1, 1, &fit1, &fit2, &sz1);
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("Skipping remainder of text extents test on a Win9x platform\n");
+        win_skip("Skipping remainder of text extents test on a Win9x platform\n");
         hfont = SelectObject(hdc, hfont);
         DeleteObject(hfont);
         ReleaseDC(0, hdc);
@@ -1002,7 +1002,7 @@ static void test_GetGlyphIndices(void)
     HFONT hOldFont;
 
     if (!pGetGlyphIndicesW) {
-        skip("GetGlyphIndicesW not available on platform\n");
+        win_skip("GetGlyphIndicesW not available on platform\n");
         return;
     }
 
@@ -1137,7 +1137,7 @@ static void test_GetKerningPairs(void)
     GetKerningPairsW(hdc, 0, NULL);
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("Skipping the GetKerningPairs test on a Win9x platform\n");
+        win_skip("Skipping the GetKerningPairs test on a Win9x platform\n");
         ReleaseDC(0, hdc);
         return;
     }
@@ -1561,7 +1561,7 @@ static void test_font_charset(void)
 
     if (!pGetGlyphIndicesA || !pGetGlyphIndicesW)
     {
-        skip("Skipping the font charset test on a Win9x platform\n");
+        win_skip("Skipping the font charset test on a Win9x platform\n");
         return;
     }
 
@@ -1606,7 +1606,7 @@ static void test_GetFontUnicodeRanges(void)
 
     if (!pGetFontUnicodeRanges)
     {
-        skip("GetFontUnicodeRanges not available before W2K\n");
+        win_skip("GetFontUnicodeRanges not available before W2K\n");
         return;
     }
 
@@ -2511,7 +2511,7 @@ static void test_GetTextMetrics(void)
 
     /* Report only once */
     if(!pGetGlyphIndicesA)
-        skip("GetGlyphIndicesA is unavailable, negative width will not be checked\n");
+        win_skip("GetGlyphIndicesA is unavailable, negative width will not be checked\n");
 
     hdc = GetDC(0);
 
@@ -2672,7 +2672,7 @@ static void test_GdiRealizationInfo(void)
 
     if(!pGdiRealizationInfo)
     {
-        skip("GdiRealizationInfo not available\n");
+        win_skip("GdiRealizationInfo not available\n");
         return;
     }
 
diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c
index 424082cc8a9..06812aa055b 100644
--- a/dlls/gdi32/tests/icm.c
+++ b/dlls/gdi32/tests/icm.c
@@ -39,7 +39,7 @@ static void test_GetICMProfileA( HDC dc )
     ret = GetICMProfileA( NULL, NULL, NULL );
     if ( !ret && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) )
     {
-        skip( "GetICMProfileA is not implemented\n" );
+        win_skip( "GetICMProfileA is not implemented\n" );
         return;
     }
     ok( !ret, "GetICMProfileA succeeded\n" );
@@ -91,7 +91,7 @@ static void test_GetICMProfileW( HDC dc )
     ret = GetICMProfileW( NULL, NULL, NULL );
     if ( !ret && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) )
     {
-        skip( "GetICMProfileW is not implemented\n" );
+        win_skip( "GetICMProfileW is not implemented\n" );
         return;
     }
     ok( !ret, "GetICMProfileW succeeded\n" );
@@ -136,7 +136,7 @@ static void test_SetICMMode( HDC dc )
     impl = GetICMProfileA( NULL, NULL, NULL );
     if ( !impl && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) )
     {
-        skip( "On NT4 where SetICMMode is not implemented but this is not advertised\n" );
+        win_skip( "On NT4 where SetICMMode is not implemented but this is not advertised\n" );
         return;
     }
 
@@ -165,7 +165,7 @@ static void test_SetICMMode( HDC dc )
     dc = CreateDCW( displayW, NULL, NULL, NULL );
     if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) )
     {
-        skip( "CreateDCW is not implemented\n" );
+        win_skip( "CreateDCW is not implemented\n" );
         return;
     }
     ok( dc != NULL, "CreateDCW failed (%d)\n", GetLastError() );
diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c
index 58e84677fcf..4a8ea6d4743 100644
--- a/dlls/gdi32/tests/path.c
+++ b/dlls/gdi32/tests/path.c
@@ -238,7 +238,7 @@ static void test_arcto(void)
         GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
         /* ArcTo is only available on Win2k and later */
-        skip("ArcTo is not available\n");
+        win_skip("ArcTo is not available\n");
         goto done;
     }
     SetArcDirection(hdc, AD_COUNTERCLOCKWISE);
@@ -282,7 +282,7 @@ static void test_anglearc(void)
         GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
         /* AngleArc is only available on Win2k and later */
-        skip("AngleArc is not available\n");
+        win_skip("AngleArc is not available\n");
         goto done;
     }
     AngleArc(hdc, 300, 300, 80, 150.0, -180.0);
@@ -355,7 +355,7 @@ static void test_polydraw(void)
         GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
         /* PolyDraw is only available on Win2k and later */
-        skip("PolyDraw is not available\n");
+        win_skip("PolyDraw is not available\n");
         goto done;
     }
     expect(TRUE, retb);