diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c
index c1b2afc734d..86a31e7023a 100644
--- a/dlls/kernel32/tests/alloc.c
+++ b/dlls/kernel32/tests/alloc.c
@@ -51,7 +51,8 @@ static void test_Heap(void)
     HANDLE heap;
     LPVOID mem1,mem1a,mem3;
     UCHAR *mem2,*mem2a;
-    UINT error,i;
+    UINT i;
+    BOOL error;
     DWORD dwSize;
 
 /* Retrieve the page size for this system */
@@ -86,10 +87,10 @@ static void test_Heap(void)
     ok(mem2!=NULL,"HeapAlloc failed\n");
     if(mem2) {
       ok(HeapSize(heap,0,mem2)>=memchunk,"HeapAlloc should return a big enough memory block\n");
-      error=0;
+      error=FALSE;
       for(i=0;i<memchunk;i++) {
         if(mem2[i]!=0) {
-          error=1;
+          error=TRUE;
         }
       }
       ok(!error,"HeapAlloc should have zeroed out it's allocated memory\n");
@@ -107,24 +108,24 @@ static void test_Heap(void)
     ok(mem2a!=NULL,"HeapReAlloc failed\n");
     if(mem2a) {
       ok(HeapSize(heap,0,mem2a)>=memchunk+5*sysInfo.dwPageSize,"HeapReAlloc failed\n");
-      error=0;
+      error=FALSE;
       for(i=0;i<5*sysInfo.dwPageSize;i++) {
         if(mem2a[memchunk+i]!=0) {
-          error=1;
+          error=TRUE;
         }
       }
       ok(!error,"HeapReAlloc should have zeroed out it's allocated memory\n");
     }
 
 /* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */
-    error=0;
+    error=FALSE;
     mem1a=HeapReAlloc(heap,HEAP_REALLOC_IN_PLACE_ONLY,mem1,memchunk+sysInfo.dwPageSize);
     if(mem1a!=NULL) {
       if(mem1a!=mem1) {
-        error=1;
+        error=TRUE;
       }
     }
-    ok(mem1a==NULL || error==0,"HeapReAlloc didn't honour HEAP_REALLOC_IN_PLACE_ONLY\n");
+    ok(mem1a==NULL || !error,"HeapReAlloc didn't honour HEAP_REALLOC_IN_PLACE_ONLY\n");
 
 /* Check that HeapFree works correctly */
    if(mem1a) {
@@ -168,7 +169,8 @@ static void test_Global(void)
     ULONG memchunk;
     HGLOBAL mem1,mem2,mem2a,mem2b;
     UCHAR *mem2ptr;
-    UINT error,i;
+    UINT i;
+    BOOL error;
     memchunk=100000;
 
     SetLastError(NO_ERROR);
@@ -187,10 +189,10 @@ static void test_Global(void)
       mem2ptr=GlobalLock(mem2);
       ok(mem2ptr==mem2,"GlobalLock should have returned the same memory as was allocated\n");
       if(mem2ptr) {
-        error=0;
+        error=FALSE;
         for(i=0;i<memchunk;i++) {
           if(mem2ptr[i]!=0) {
-            error=1;
+            error=TRUE;
           }
         }
         ok(!error,"GlobalAlloc should have zeroed out it's allocated memory\n");
@@ -214,10 +216,10 @@ static void test_Global(void)
       mem2ptr=GlobalLock(mem2a);
       ok(mem2ptr!=NULL,"GlobalLock Failed\n");
       if(mem2ptr) {
-        error=0;
+        error=FALSE;
         for(i=0;i<memchunk;i++) {
           if(mem2ptr[memchunk+i]!=0) {
-            error=1;
+            error=TRUE;
           }
         }
         ok(!error,"GlobalReAlloc should have zeroed out it's allocated memory\n");
@@ -260,7 +262,8 @@ static void test_Local(void)
     ULONG memchunk;
     HLOCAL mem1,mem2,mem2a,mem2b;
     UCHAR *mem2ptr;
-    UINT error,i;
+    UINT i;
+    BOOL error;
     memchunk=100000;
 
 /* Check that a normal alloc works */
@@ -278,16 +281,16 @@ static void test_Local(void)
       mem2ptr=LocalLock(mem2);
       ok(mem2ptr!=NULL,"LocalLock: error=%d\n",GetLastError());
       if(mem2ptr) {
-        error=0;
+        error=FALSE;
         for(i=0;i<memchunk;i++) {
           if(mem2ptr[i]!=0) {
-            error=1;
+            error=TRUE;
           }
         }
         ok(!error,"LocalAlloc should have zeroed out it's allocated memory\n");
         SetLastError(0);
         error=LocalUnlock(mem2);
-        ok(error==0 && GetLastError()==NO_ERROR,
+        ok(!error && GetLastError()==NO_ERROR,
            "LocalUnlock Failed: rc=%d err=%d\n",error,GetLastError());
       }
     }
@@ -306,10 +309,10 @@ static void test_Local(void)
       mem2ptr=LocalLock(mem2a);
       ok(mem2ptr!=NULL,"LocalLock Failed\n");
       if(mem2ptr) {
-        error=0;
+        error=FALSE;
         for(i=0;i<memchunk;i++) {
           if(mem2ptr[memchunk+i]!=0) {
-            error=1;
+            error=TRUE;
           }
         }
         ok(!error,"LocalReAlloc should have zeroed out it's allocated memory\n");
@@ -356,7 +359,8 @@ static void test_Virtual(void)
     SYSTEM_INFO sysInfo;
     ULONG memchunk;
     UCHAR *mem1;
-    UINT error,i;
+    UINT i;
+    BOOL error;
 
 /* Retrieve the page size for this system */
     sysInfo.dwPageSize=0;
@@ -371,19 +375,19 @@ static void test_Virtual(void)
     ok(mem1!=NULL,"VirtualAlloc failed\n");
     if(mem1) {
 /* check that memory is initialized to 0 */
-      error=0;
+      error=FALSE;
       for(i=0;i<memchunk;i++) {
         if(mem1[i]!=0) {
-          error=1;
+          error=TRUE;
         }
       }
       ok(!error,"VirtualAlloc did not initialize memory to '0's\n");
 /* Check that we can read/write to memory */
-      error=0;
+      error=FALSE;
       for(i=0;i<memchunk;i+=100) {
         mem1[i]='a';
         if(mem1[i]!='a') {
-          error=1;
+          error=TRUE;
         }
       }
       ok(!error,"Virtual memory was not writable\n");
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 7ed71a72a84..daf88516f89 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -2147,7 +2147,7 @@ static unsigned int map_file_access( unsigned int access )
     return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
 }
 
-static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2 )
+static BOOL is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2 )
 {
     access1 = map_file_access( access1 );
     access2 = map_file_access( access2 );
@@ -2157,22 +2157,22 @@ static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2,
     if (!access1) sharing1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE;
     if (!access2) sharing2 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE;
 
-    if ((access1 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing2 & FILE_SHARE_READ)) return 0;
-    if ((access1 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing2 & FILE_SHARE_WRITE)) return 0;
-    if ((access1 & DELETE) && !(sharing2 & FILE_SHARE_DELETE)) return 0;
-    if ((access2 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing1 & FILE_SHARE_READ)) return 0;
-    if ((access2 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing1 & FILE_SHARE_WRITE)) return 0;
-    if ((access2 & DELETE) && !(sharing1 & FILE_SHARE_DELETE)) return 0;
-    return 1;
+    if ((access1 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing2 & FILE_SHARE_READ)) return FALSE;
+    if ((access1 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing2 & FILE_SHARE_WRITE)) return FALSE;
+    if ((access1 & DELETE) && !(sharing2 & FILE_SHARE_DELETE)) return FALSE;
+    if ((access2 & (FILE_READ_DATA|FILE_EXECUTE)) && !(sharing1 & FILE_SHARE_READ)) return FALSE;
+    if ((access2 & (FILE_WRITE_DATA|FILE_APPEND_DATA)) && !(sharing1 & FILE_SHARE_WRITE)) return FALSE;
+    if ((access2 & DELETE) && !(sharing1 & FILE_SHARE_DELETE)) return FALSE;
+    return TRUE;
 }
 
-static int is_sharing_map_compatible( DWORD map_access, DWORD access2, DWORD sharing2 )
+static BOOL is_sharing_map_compatible( DWORD map_access, DWORD access2, DWORD sharing2 )
 {
     if ((map_access == PAGE_READWRITE || map_access == PAGE_EXECUTE_READWRITE) &&
-        !(sharing2 & FILE_SHARE_WRITE)) return 0;
+        !(sharing2 & FILE_SHARE_WRITE)) return FALSE;
     access2 = map_file_access( access2 );
-    if ((map_access & SEC_IMAGE) && (access2 & FILE_WRITE_DATA)) return 0;
-    return 1;
+    if ((map_access & SEC_IMAGE) && (access2 & FILE_WRITE_DATA)) return FALSE;
+    return TRUE;
 }
 
 static void test_file_sharing(void)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 417e7d6dcb0..bbb7d238cf2 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -61,7 +61,7 @@ static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch )
     return NULL;
 }
 
-static inline int isdigitW( WCHAR wc )
+static inline BOOL isdigitW( WCHAR wc )
 {
     WORD type;
     GetStringTypeW( CT_CTYPE1, &wc, 1, &type );
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 82bf77661e8..e884c0c97a7 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -198,21 +198,22 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR *
 
 /* split path into leading directory, and 8.3 filename */
 static void test_SplitShortPathA(CHAR *path,CHAR *dir,CHAR *eight,CHAR *three) {
-  int done,error;
+  BOOL done = FALSE, error = FALSE;
   int ext,fil;
   int len,i;
   len=lstrlenA(path);
-  ext=len; fil=len; done=0; error=0;
+  ext=len;
+  fil=len;
 /* walk backwards over path looking for '.' or '\\' separators */
   for(i=len-1;(i>=0) && (!done);i--) {
     if(path[i]=='.')
-      if(ext!=len) error=1; else ext=i;
+      if(ext!=len) error=TRUE; else ext=i;
     else if(path[i]=='\\') {
       if(i==len-1) {
-        error=1;
+        error=TRUE;
       } else {
         fil=i;
-        done=1;
+        done=TRUE;
       }
     }
   }
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index f5c5ecf4d15..8658ac4e077 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -183,12 +183,12 @@ static WCHAR*   decodeW(const char* str)
  *      exename:        executable without the path
  * function-pointers, which are not implemented in all windows versions
  */
-static int     init(void)
+static BOOL init(void)
 {
     char *p;
 
     myARGC = winetest_get_mainargs( &myARGV );
-    if (!GetCurrentDirectoryA(sizeof(base), base)) return 0;
+    if (!GetCurrentDirectoryA(sizeof(base), base)) return FALSE;
     strcpy(selfname, myARGV[0]);
 
     /* Strip the path of selfname */
@@ -206,7 +206,7 @@ static int     init(void)
     pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA");
     pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW");
     pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA");
-    return 1;
+    return TRUE;
 }
 
 /******************************************************************
@@ -2062,7 +2062,7 @@ static void test_DuplicateHandle(void)
 
 START_TEST(process)
 {
-    int b = init();
+    BOOL b = init();
     ok(b, "Basic init of CreateProcess test\n");
     if (!b) return;