diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 1215ef587a0..5573c6af1a0 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -1202,7 +1202,7 @@ START_TEST(actctx)
 
     if (!init_funcs())
     {
-        skip("Needed functions are not available\n");
+        win_skip("Needed functions are not available\n");
         return;
     }
     init_paths();
diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index cb500ef4076..7f011a059aa 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -264,7 +264,7 @@ static void test_ffcn(void)
     r = GetTempPathW( MAX_PATH, path );
     if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
     {
-        skip("GetTempPathW is not implemented\n");
+        win_skip("GetTempPathW is not implemented\n");
         return;
     }
     ok( r != 0, "temp path failed\n");
@@ -387,7 +387,7 @@ static void test_readdirectorychanges(void)
 
     if (!pReadDirectoryChangesW)
     {
-        skip("ReadDirectoryChangesW is not available\n");
+        win_skip("ReadDirectoryChangesW is not available\n");
         return;
     }
 
@@ -395,7 +395,7 @@ static void test_readdirectorychanges(void)
     r = GetTempPathW( MAX_PATH, path );
     if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
     {
-        skip("GetTempPathW is not implemented\n");
+        win_skip("GetTempPathW is not implemented\n");
         return;
     }
     ok( r != 0, "temp path failed\n");
@@ -615,14 +615,14 @@ static void test_readdirectorychanges_null(void)
 
     if (!pReadDirectoryChangesW)
     {
-        skip("ReadDirectoryChangesW is not available\n");
+        win_skip("ReadDirectoryChangesW is not available\n");
         return;
     }
     SetLastError(0xdeadbeef);
     r = GetTempPathW( MAX_PATH, path );
     if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
     {
-        skip("GetTempPathW is not implemented\n");
+        win_skip("GetTempPathW is not implemented\n");
         return;
     }
     ok( r != 0, "temp path failed\n");
@@ -717,7 +717,7 @@ static void test_readdirectorychanges_filedir(void)
     r = GetTempPathW( MAX_PATH, path );
     if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
     {
-        skip("GetTempPathW is not implemented\n");
+        win_skip("GetTempPathW is not implemented\n");
         return;
     }
     ok( r != 0, "temp path failed\n");
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index eb51f7a4400..830dbc13119 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -706,7 +706,7 @@ static void testScreenBuffer(HANDLE hConOut)
     ret = SetConsoleOutputCP(866);
     if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("SetConsoleOutputCP is not implemented\n");
+        win_skip("SetConsoleOutputCP is not implemented\n");
         return;
     }
     ok(ret, "Cannot set output codepage to 866\n");
@@ -962,7 +962,7 @@ START_TEST(console)
 
     if (!pGetConsoleInputExeNameA || !pSetConsoleInputExeNameA)
     {
-        skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n");
+        win_skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n");
         return;
     }
     else
diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c
index 6a13aece211..b3526675b20 100644
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -148,7 +148,7 @@ static void test_GetSetEnvironmentVariableW(void)
     if (ret == FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
     {
         /* Must be Win9x which doesn't support the Unicode functions */
-        skip("SetEnvironmentVariableW is not implemented\n");
+        win_skip("SetEnvironmentVariableW is not implemented\n");
         return;
     }
     ok(ret == TRUE,
@@ -359,7 +359,7 @@ static void test_GetComputerName(void)
     ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size);
     error = GetLastError();
     if (error == ERROR_CALL_NOT_IMPLEMENTED)
-        skip("GetComputerNameW is not implemented\n");
+        win_skip("GetComputerNameW is not implemented\n");
     else
     {
         todo_wine
@@ -384,7 +384,7 @@ static void test_GetComputerNameExA(void)
 
     if (!pGetComputerNameExA)
     {
-        skip("GetComputerNameExA function not implemented\n");
+        win_skip("GetComputerNameExA function not implemented\n");
         return;
     }
 
@@ -458,7 +458,7 @@ static void test_GetComputerNameExW(void)
 
     if (!pGetComputerNameExW)
     {
-        skip("GetComputerNameExW function not implemented\n");
+        win_skip("GetComputerNameExW function not implemented\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 906924b1262..89b284d74cf 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -1506,7 +1506,7 @@ static void test_FindFirstFileExA(void)
 
     if (!pFindFirstFileExA)
     {
-        skip("FindFirstFileExA() is missing\n");
+        win_skip("FindFirstFileExA() is missing\n");
         return;
     }
 
@@ -1519,7 +1519,7 @@ static void test_FindFirstFileExA(void)
     handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0);
     if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("FindFirstFileExA is not implemented\n");
+        win_skip("FindFirstFileExA is not implemented\n");
         goto cleanup;
     }
     ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError());
@@ -2139,7 +2139,7 @@ static void test_ReplaceFileA(void)
 
     if (!pReplaceFileA)
     {
-        skip("ReplaceFileA() is missing\n");
+        win_skip("ReplaceFileA() is missing\n");
         return;
     }
 
@@ -2347,7 +2347,7 @@ static void test_ReplaceFileW(void)
 
     if (!pReplaceFileW)
     {
-        skip("ReplaceFileW() is missing\n");
+        win_skip("ReplaceFileW() is missing\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
index 74d51090074..cbb8b5aec38 100644
--- a/dlls/kernel32/tests/format_msg.c
+++ b/dlls/kernel32/tests/format_msg.c
@@ -237,7 +237,7 @@ static void test_message_null_buffer(void)
     error = GetLastError();
     if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("FormatMessageW is not implemented\n");
+        win_skip("FormatMessageW is not implemented\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 57bfa013d63..e88e182a37c 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1909,7 +1909,7 @@ static void test_FoldStringW(void)
 
   if (!pFoldStringW)
   {
-    skip("FoldStringW is not available\n");
+    win_skip("FoldStringW is not available\n");
     return; /* FoldString is present in NT v3.1+, but not 95/98/Me */
   }
 
@@ -1921,7 +1921,7 @@ static void test_FoldStringW(void)
     ret = pFoldStringW(badFlags[i], src, 256, dst, 256);
     if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
     {
-      skip("FoldStringW is not implemented\n");
+      win_skip("FoldStringW is not implemented\n");
       return;
     }
     ok(!ret && GetLastError() == ERROR_INVALID_FLAGS,
@@ -2299,7 +2299,7 @@ static void test_EnumUILanguageA(void)
 {
   BOOL ret;
   if (!pEnumUILanguagesA) {
-    skip("EnumUILanguagesA is not available on Win9x or NT4\n");
+    win_skip("EnumUILanguagesA is not available on Win9x or NT4\n");
     return;
   }
 
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 397d4f46962..20ee4535b85 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -961,7 +961,7 @@ static void test_GetLongPathNameW(void)
     length = pGetLongPathNameW(NULL,NULL,0);
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("GetLongPathNameW is not implemented\n");
+        win_skip("GetLongPathNameW is not implemented\n");
         return;
     }
     ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length);
@@ -990,7 +990,7 @@ static void test_GetShortPathNameW(void)
     GetTempPathW( MAX_PATH, path );
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("GetTempPathW is not implemented\n");
+        win_skip("GetTempPathW is not implemented\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 22d5cbf90b1..21dff3cc709 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -1409,7 +1409,7 @@ static void test_OpenProcess(void)
 
     /* not exported in all windows versions */
     if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) {
-        skip("VirtualAllocEx not found\n");
+        win_skip("VirtualAllocEx not found\n");
         return;
     }
 
@@ -1423,7 +1423,7 @@ static void test_OpenProcess(void)
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {   /* Win9x */
         CloseHandle(hproc);
-        skip("VirtualAllocEx not implemented\n");
+        win_skip("VirtualAllocEx not implemented\n");
         return;
     }
     ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError());
diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c
index cde27a8d535..622f7814c8f 100644
--- a/dlls/kernel32/tests/resource.c
+++ b/dlls/kernel32/tests/resource.c
@@ -310,7 +310,7 @@ START_TEST(resource)
 
     if (GLE == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("Resource calls are not implemented\n");
+        win_skip("Resource calls are not implemented\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
index 391046658f1..b15c090708e 100644
--- a/dlls/kernel32/tests/sync.c
+++ b/dlls/kernel32/tests/sync.c
@@ -54,7 +54,7 @@ static void test_signalandwait(void)
     r = pSignalObjectAndWait(NULL, NULL, 0, 0);
     if (r == ERROR_INVALID_FUNCTION)
     {
-        skip("SignalObjectAndWait is not implemented\n");
+        win_skip("SignalObjectAndWait is not implemented\n");
         return; /* Win98/ME */
     }
     ok( r == WAIT_FAILED, "should fail\n");
@@ -220,7 +220,7 @@ static void test_slist(void)
         pInterlockedPopEntrySList == NULL ||
         pInterlockedPushEntrySList == NULL)
     {
-        skip("some required slist entrypoints were not found, skipping tests\n");
+        win_skip("some required slist entrypoints were not found, skipping tests\n");
         return;
     }
 
@@ -393,7 +393,7 @@ static void test_waitable_timer(void)
 
     if (!pCreateWaitableTimerA || !pOpenWaitableTimerA)
     {
-        skip("{Create,Open}WaitableTimerA() is not available\n");
+        win_skip("{Create,Open}WaitableTimerA() is not available\n");
         return;
     }
 
@@ -455,7 +455,7 @@ static void test_iocp_callback(void)
 
     p_BindIoCompletionCallback = (void*)GetProcAddress(hmod, "BindIoCompletionCallback");
     if(!p_BindIoCompletionCallback) {
-        skip("BindIoCompletionCallback not found in this DLL\n");
+        win_skip("BindIoCompletionCallback not found in this DLL\n");
         return;
     }
 
@@ -645,7 +645,7 @@ static void test_timer_queue(void)
     if (!pChangeTimerQueueTimer || !pCreateTimerQueue || !pCreateTimerQueueTimer
         || !pDeleteTimerQueueEx || !pDeleteTimerQueueTimer)
     {
-        skip("TimerQueue API not present\n");
+        win_skip("TimerQueue API not present\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index b3916cdefc4..fa57fd96505 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -308,7 +308,7 @@ static VOID test_CreateRemoteThread(void)
                                  hRemoteEvent, CREATE_SUSPENDED, &tid);
     if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("CreateRemoteThread is not implemented\n");
+        win_skip("CreateRemoteThread is not implemented\n");
         goto cleanup;
     }
     ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError());
@@ -978,7 +978,7 @@ static void test_RegisterWaitForSingleObject(void)
 
     if (!pRegisterWaitForSingleObject || !pUnregisterWait)
     {
-        skip("RegisterWaitForSingleObject or UnregisterWait not implemented\n");
+        win_skip("RegisterWaitForSingleObject or UnregisterWait not implemented\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index 21a8232b917..0b3959a56e5 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -294,7 +294,7 @@ static void test_GetTimeZoneInformation(void)
 
     if (!pSystemTimeToTzSpecificLocalTime)
     {
-        skip("SystemTimeToTzSpecificLocalTime not present\n");
+        win_skip("SystemTimeToTzSpecificLocalTime not available\n");
         return;
     }
 
@@ -305,7 +305,7 @@ static void test_GetTimeZoneInformation(void)
     res = pSystemTimeToTzSpecificLocalTime(&tzinfo, &utc, &current);
     if (!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {
-        skip("SystemTimeToTzSpecificLocalTime is not implemented\n");
+        win_skip("SystemTimeToTzSpecificLocalTime is not implemented\n");
         return;
     }
 
@@ -425,7 +425,7 @@ static void test_TzSpecificLocalTimeToSystemTime(void)
 
     if (!pTzSpecificLocalTimeToSystemTime || !pSystemTimeToTzSpecificLocalTime)
     {
-        skip("TzSpecificLocalTimeToSystemTime or SystemTimeToTzSpecificLocalTime not present\n");
+        win_skip("TzSpecificLocalTimeToSystemTime or SystemTimeToTzSpecificLocalTime not available\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c
index 3608ef83303..3c3fde76f11 100644
--- a/dlls/kernel32/tests/timer.c
+++ b/dlls/kernel32/tests/timer.c
@@ -39,14 +39,14 @@ static void test_timer(void)
     pCreateWaitableTimerA = (fnCreateWaitableTimerA) GetProcAddress( hker, "CreateWaitableTimerA");
     if( !pCreateWaitableTimerA )
     {
-        skip("CreateWaitableTimerA is not available\n");
+        win_skip("CreateWaitableTimerA is not available\n");
         return;
     }
 
     pSetWaitableTimer = (fnSetWaitableTimer) GetProcAddress( hker, "SetWaitableTimer");
     if( !pSetWaitableTimer )
     {
-        skip("SetWaitableTimer is not available\n");
+        win_skip("SetWaitableTimer is not available\n");
         return;
     }
        
diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c
index 529df8890ce..708a81ebe84 100644
--- a/dlls/kernel32/tests/toolhelp.c
+++ b/dlls/kernel32/tests/toolhelp.c
@@ -305,7 +305,7 @@ START_TEST(toolhelp)
         !pProcess32First || !pProcess32Next ||
         !pThread32First || !pThread32Next)
     {
-        skip("Needed functions are not available, most likely running on Windows NT\n");
+        win_skip("Needed functions are not available, most likely running on Windows NT\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index d051b5d875b..5805e32f6e2 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -107,7 +107,7 @@ static void test_VerifyVersionInfo(void)
 
     if(!pVerifyVersionInfoA || !pVerSetConditionMask)
     {
-        skip("Needed functions not available\n");
+        win_skip("Needed functions not available\n");
         return;
     }
 
diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index ae812cd5d15..5bea0099ebd 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -66,7 +66,7 @@ static void test_VirtualAllocEx(void)
 
     /* not exported in all windows-versions  */
     if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) {
-        skip("VirtualAllocEx not found\n");
+        win_skip("Virtual{Alloc,Free}Ex not available\n");
         return;
     }
 
@@ -78,7 +78,7 @@ static void test_VirtualAllocEx(void)
                            PAGE_EXECUTE_READWRITE);
     if (!addr1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
     {   /* Win9x */
-        skip("VirtualAllocEx not implemented\n");
+        win_skip("VirtualAllocEx not implemented\n");
         TerminateProcess(hProcess, 0);
         CloseHandle(hProcess);
         return;
@@ -703,7 +703,7 @@ static void test_NtMapViewOfSection(void)
     pNtUnmapViewOfSection = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection" );
     if (!pNtMapViewOfSection || !pNtUnmapViewOfSection)
     {
-        skip( "NtMapViewOfSection not found\n" );
+        win_skip( "NtMapViewOfSection not available\n" );
         return;
     }