diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index 08d14174039..49dbb8803a2 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -369,9 +369,8 @@ static void test_ffcnMultipleThreads(void)
     ok( r == TRUE, "failed to remove dir\n");
 }
 
-typedef BOOL (WINAPI *fnReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD,
+static BOOL (WINAPI *pReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD,
                          LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
-fnReadDirectoryChangesW pReadDirectoryChangesW;
 
 static void test_readdirectorychanges(void)
 {
@@ -874,8 +873,7 @@ static void test_ffcn_directory_overlap(void)
 START_TEST(change)
 {
     HMODULE hkernel32 = GetModuleHandle("kernel32");
-    pReadDirectoryChangesW = (fnReadDirectoryChangesW)
-        GetProcAddress(hkernel32, "ReadDirectoryChangesW");
+    pReadDirectoryChangesW = (void *)GetProcAddress(hkernel32, "ReadDirectoryChangesW");
 
     test_ffcnMultipleThreads();
     /* The above function runs a test that must occur before FindCloseChangeNotification is run in the
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index f5a56c6d1ea..b38da237dec 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -392,7 +392,7 @@ static DWORD CALLBACK alarmThreadMain(LPVOID arg)
     return 1;
 }
 
-HANDLE hnp = INVALID_HANDLE_VALUE;
+static HANDLE hnp = INVALID_HANDLE_VALUE;
 
 /** Trivial byte echo server - disconnects after each session */
 static DWORD CALLBACK serverThreadMain1(LPVOID arg)
diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c
index 092787796af..a85e6d2daa1 100644
--- a/dlls/kernel32/tests/resource.c
+++ b/dlls/kernel32/tests/resource.c
@@ -26,11 +26,11 @@
 static const char filename[] = "test_.exe";
 static DWORD GLE;
 
-enum {
+enum constants {
     page_size = 0x1000,
     rva_rsrc_start = page_size * 3,
     max_sections = 3
-} constants;
+};
 
 /* rodata @ [0x1000-0x3000) */
 static const IMAGE_SECTION_HEADER sh_rodata_1 =
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index 19e695bcbf5..c285b018c6e 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -146,7 +146,7 @@ static void cleanup_thread_sync_helpers(void)
   CloseHandle(stop_event);
 }
 
-DWORD tlsIndex;
+static DWORD tlsIndex;
 
 typedef struct {
   int threadnum;
@@ -157,7 +157,7 @@ typedef struct {
 /* WinME supports OpenThread but doesn't know about access restrictions so
    we require them to be either completely ignored or always obeyed.
 */
-INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */
+static INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */
 #define obey_ar(x) \
   (obeying_ars == 0 \
     ? ((x) \