diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt
index ef8f8830a9e01..b194f906fbc60 100644
--- a/modules/rostests/apitests/kernel32/CMakeLists.txt
+++ b/modules/rostests/apitests/kernel32/CMakeLists.txt
@@ -28,6 +28,7 @@ list(APPEND SOURCE
     lstrlen.c
     Mailslot.c
     MultiByteToWideChar.c
+    Pipes.c
     PrivMoveFileIdentityW.c
     QueueUserAPC.c
     SetComputerNameExW.c
@@ -38,8 +39,7 @@ list(APPEND SOURCE
     TerminateProcess.c
     TunnelCache.c
     UEFIFirmware.c
-    WideCharToMultiByte.c
-    Pipes.c)
+    WideCharToMultiByte.c)
 
 list(APPEND PCH_SKIP_SOURCE
     testlist.c)
diff --git a/modules/rostests/apitests/kernel32/Pipes.c b/modules/rostests/apitests/kernel32/Pipes.c
index 3aae66b6fa5de..050a332c41d09 100644
--- a/modules/rostests/apitests/kernel32/Pipes.c
+++ b/modules/rostests/apitests/kernel32/Pipes.c
@@ -17,13 +17,13 @@ static DWORD dReadBufferSize;
 DWORD
 WINAPI
 PipeWriter(
-        LPVOID lpParam)
+        _In_ PVOID Param)
 {
     DWORD cbWritten;
     HANDLE hPipe;
-    NTSTATUS lastError;
-    BOOL returnStatus;
-    LPSTR lpsInMsg  = "Test";
+    DWORD dwLastError;
+    BOOL Success;
+    PCSTR pszInMsg = "Test";
 
     hPipe = CreateFile(LP, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
             NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -31,12 +31,12 @@ PipeWriter(
     if (hPipe != INVALID_HANDLE_VALUE)
     {
         Sleep(1000);
-        returnStatus = WriteFile(hPipe, &lpsInMsg, 4, &cbWritten, (LPOVERLAPPED) NULL);
-        lastError = GetLastError();
+        Success = WriteFile(hPipe, &pszInMsg, 4, &cbWritten, NULL);
+        dwLastError = GetLastError();
 
-        ok(returnStatus, "Pipe's WriteFile returned FALSE, instead of expected TRUE\n");
-        if(lastError != 0)
-            trace("Last Error = 0x%lX\n",lastError);
+        ok(Success, "Pipe's WriteFile returned FALSE, instead of expected TRUE\n");
+        if(dwLastError != 0)
+            trace("Last Error = 0x%lX\n",dwLastError);
 
         ok(cbWritten > 0,"Pipe's Writefile has lpNumberOfBytesWritten <= 0\n");
 
@@ -48,16 +48,25 @@ PipeWriter(
 DWORD
 WINAPI
 PipeReader(
-        LPVOID lpParam)
+        _In_ PVOID Param)
 {
     HANDLE hPipe;
     DWORD cbRead;
     HANDLE hThread;
-    NTSTATUS lastError;
-    BOOL returnStatus;
-    char lpsOutMsg[MAXBUFFERSIZE];
-
-    hPipe = CreateNamedPipeA(LP, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE|PIPE_READMODE_MESSAGE,1,MAXBUFFERSIZE,MAXBUFFERSIZE,0,NULL);
+    DWORD dwLastError;
+    BOOL Success;
+    CHAR szOutMsg[MAXBUFFERSIZE];
+
+    hPipe = CreateNamedPipeA( 
+        LP,
+        PIPE_ACCESS_DUPLEX,
+        PIPE_TYPE_MESSAGE|PIPE_READMODE_MESSAGE,
+        1,
+        MAXBUFFERSIZE,
+        MAXBUFFERSIZE,
+        0,
+        NULL
+    );
     ok(hPipe != INVALID_HANDLE_VALUE, "CreateNamedPipeA failed\n");
     if (hPipe != INVALID_HANDLE_VALUE)
     {
@@ -66,21 +75,21 @@ PipeReader(
         if (hThread != INVALID_HANDLE_VALUE)
         {
             Sleep(1000);
-            returnStatus = ReadFile(hPipe, &lpsOutMsg, dReadBufferSize, &cbRead, NULL);
-            lastError = GetLastError();
+            Success = ReadFile(hPipe, &szOutMsg, dReadBufferSize, &cbRead, NULL);
+            dwLastError = GetLastError();
 
             if(dReadBufferSize == MINBUFFERSIZE)
-                ok(!returnStatus, "Pipe's ReadFile returned TRUE, instead of expected FALSE\n");
+                ok(!Success, "Pipe's ReadFile returned TRUE, instead of expected FALSE\n");
             else{
-                ok(returnStatus, "Pipe's ReadFile returned FALSE, instead of expected TRUE\n");
-                if(lastError != 0)
-                    trace("Last Error = 0x%lX\n",lastError);
+                ok(Success, "Pipe's ReadFile returned FALSE, instead of expected TRUE\n");
+                if(dwLastError != 0)
+                    trace("Last Error = 0x%lX\n",dwLastError);
             }
 
             ok(cbRead > 0,"Pipe's Readfile has lpNumberOfBytesRead <= 0\n");
 
             if(dReadBufferSize == MINBUFFERSIZE)
-                ok(lastError == ERROR_MORE_DATA, "Pipe's ReadFile last error is unexpected\n");
+                ok(dwLastError == ERROR_MORE_DATA, "Pipe's ReadFile last error is unexpected\n");
 
             WaitForSingleObject(hThread, INFINITE);
             CloseHandle(hThread);
@@ -93,9 +102,9 @@ PipeReader(
 VOID
 StartTestCORE17376(DWORD adReadBufferSize)
 {
-    HANDLE  hThread;
+    HANDLE hThread;
 
-    trace("adReadBufferSize = %ld - START\n",adReadBufferSize);
+    trace("adReadBufferSize = %ld - START\n", adReadBufferSize);
 
     dReadBufferSize = adReadBufferSize;
 
@@ -107,7 +116,7 @@ StartTestCORE17376(DWORD adReadBufferSize)
         CloseHandle(hThread);
     }
 
-    trace("adReadBufferSize = %ld - COMPLETED\n",adReadBufferSize);
+    trace("adReadBufferSize = %ld - COMPLETED\n", adReadBufferSize);
 }
 
 START_TEST(Pipes)
diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c
index aad7eba8d6d7e..d011c816a97fc 100644
--- a/modules/rostests/apitests/kernel32/testlist.c
+++ b/modules/rostests/apitests/kernel32/testlist.c
@@ -28,6 +28,7 @@ extern void func_lstrcpynW(void);
 extern void func_lstrlen(void);
 extern void func_Mailslot(void);
 extern void func_MultiByteToWideChar(void);
+extern void func_Pipes(void);
 extern void func_PrivMoveFileIdentityW(void);
 extern void func_QueueUserAPC(void);
 extern void func_SetComputerNameExW(void);
@@ -39,7 +40,6 @@ extern void func_TerminateProcess(void);
 extern void func_TunnelCache(void);
 extern void func_UEFIFirmware(void);
 extern void func_WideCharToMultiByte(void);
-extern void func_Pipes(void);
 
 const struct test winetest_testlist[] =
 {