diff --git a/test_conformance/c11_atomics/host_atomics.h b/test_conformance/c11_atomics/host_atomics.h
index b865970f..efa36ad3 100644
--- a/test_conformance/c11_atomics/host_atomics.h
+++ b/test_conformance/c11_atomics/host_atomics.h
@@ -53,12 +53,12 @@ enum TExplicitMemoryOrderType
 #endif
 
 #define HOST_ATOMIC_INTPTR_T32  HOST_ATOMIC_INT
-#define HOST_ATOMIC_UINTPTR_T32 HOST_ATOMIC_INT
+#define HOST_ATOMIC_UINTPTR_T32 HOST_ATOMIC_UINT
 #define HOST_ATOMIC_SIZE_T32    HOST_ATOMIC_UINT
 #define HOST_ATOMIC_PTRDIFF_T32 HOST_ATOMIC_INT
 
 #define HOST_ATOMIC_INTPTR_T64  HOST_ATOMIC_LONG
-#define HOST_ATOMIC_UINTPTR_T64 HOST_ATOMIC_LONG
+#define HOST_ATOMIC_UINTPTR_T64 HOST_ATOMIC_ULONG
 #define HOST_ATOMIC_SIZE_T64    HOST_ATOMIC_ULONG
 #define HOST_ATOMIC_PTRDIFF_T64 HOST_ATOMIC_LONG
 
@@ -82,7 +82,7 @@ enum TExplicitMemoryOrderType
 #define HOST_SIZE_T64           cl_ulong
 #define HOST_PTRDIFF_T64        cl_long
 
-#define HOST_FLAG               cl_uint
+#define HOST_FLAG cl_int
 
 // host atomic functions
 void host_atomic_thread_fence(TExplicitMemoryOrderType order);