diff --git a/projects/hip-tests/catch/CMakeLists.txt b/projects/hip-tests/catch/CMakeLists.txt
index 03e018bbbf..2a4c6a31a5 100644
--- a/projects/hip-tests/catch/CMakeLists.txt
+++ b/projects/hip-tests/catch/CMakeLists.txt
@@ -210,7 +210,7 @@ if(DEFINED OFFLOAD_ARCH_STR)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OFFLOAD_ARCH_STR} ")
 elseif(DEFINED ENV{HCC_AMDGPU_TARGET})
     # hipcc pl script appends it to the options
-    set(OFFLOAD_ARCH_STR " --offload-arch=$ENV{HCC_AMDGPU_TARGET}")
+    set(OFFLOAD_ARCH_STR "--offload-arch=$ENV{HCC_AMDGPU_TARGET}")
     set(HIP_GPU_ARCH_LIST $ENV{HCC_AMDGPU_TARGET})
 endif()
 message(STATUS "Using offload arch string: ${OFFLOAD_ARCH_STR}")
diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json
index 67c76ef238..3f6fb803dc 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json
@@ -109,6 +109,24 @@
 	   "Unit_hipGraphDestroyNode_Complx_ChkNumOfNodesNDep_ChldNode",
 	   "Unit_hipMemGetAddressRange_Negative",
 	   "Unit_hipMemGetAddressRange_Positive",
+	   "Note: devicelib hangs and failures",
+	   "Unit_deviceAllocation_Malloc_PerThread_PrimitiveDataType",
+	   "Unit_deviceAllocation_New_PerThread_PrimitiveDataType",
+	   "Unit_deviceAllocation_Malloc_PerThread_StructDataType",
+	   "Unit_deviceAllocation_New_PerThread_StructDataType",
+	   "Unit_deviceAllocation_Malloc_AcrossKernels",
+	   "Unit_deviceAllocation_New_AcrossKernels",
+	   "Unit_deviceAllocation_Malloc_SingleCodeObj",
+	   "Unit_deviceAllocation_New_SingleCodeObj",
+	   "Unit_deviceAllocation_Malloc_PerThread_Graph",
+	   "Unit_deviceAllocation_New_PerThread_Graph",
+	   "Unit_deviceAllocation_Malloc_DeviceFunc",
+	   "Unit_deviceAllocation_VirtualFunction",
+	   "Unit_deviceAllocation_Malloc_MulKernels_MulThreads",
+	   "Unit_deviceAllocation_New_MulKernels_MulThreads",
+	   "Unit_deviceAllocation_Malloc_MulCodeObj",
+	   "Unit_deviceAllocation_New_MulCodeObj",
+	   "Unit_deviceAllocation_New_DeviceFunc",
 	   "Unit_hipGraphAddEventRecordNode_MultipleRun",
 	   "Unit_hipDeviceGetPCIBusId_Negative_PartialFill",
 	   "Unit_hipStreamValue_Wait64_Blocking_NoMask_Nor",
diff --git a/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt b/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt
index 89d38a136e..006b0767ed 100644
--- a/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt
@@ -13,6 +13,7 @@ set(TEST_SRC
     syncthreadsand.cc
     syncthreadscount.cc
     syncthreadsor.cc
+    deviceAllocation.cc
     Atomic_func.cc
     DoublePrecisionIntrinsics.cc
     DoublePrecisionMathDevice.cc
@@ -28,11 +29,6 @@ set(TEST_SRC
     hipTestClock.cc
 )
 
-if(UNIX)
-    set(TEST_SRC ${TEST_SRC}
-        deviceAllocation.cc)
-endif()
-
 # AMD only tests
 set(AMD_TEST_SRC
     unsafeAtomicAdd.cc
@@ -64,12 +60,30 @@ set(AMD_ARCH_SPEC_TEST_SRC
 
 # Note to pass arch use format like -DOFFLOAD_ARCH_STR="--offload-arch=gfx900  --offload-arch=gfx906"
 # having space at the start/end of OFFLOAD_ARCH_STR can cause build failures
-if(UNIX)
-    add_custom_target(kerDevAllocMultCO.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevAllocMultCO.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevAllocMultCO.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-    add_custom_target(kerDevWriteMultCO.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevWriteMultCO.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevWriteMultCO.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-    add_custom_target(kerDevFreeMultCO.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevFreeMultCO.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevFreeMultCO.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-    add_custom_target(kerDevAllocSingleKer.code COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR} ${CMAKE_CURRENT_SOURCE_DIR}/kerDevAllocSingleKer.cc -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevAllocSingleKer.code -I${HIP_PATH}/include/ -I${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-endif()
+add_custom_target(kerDevAllocMultCO.code
+                  COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
+                  ${CMAKE_CURRENT_SOURCE_DIR}/kerDevAllocMultCO.cc
+                  -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevAllocMultCO.code
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
+add_custom_target(kerDevWriteMultCO.code
+                  COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
+                  ${CMAKE_CURRENT_SOURCE_DIR}/kerDevWriteMultCO.cc
+                  -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevWriteMultCO.code
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
+add_custom_target(kerDevFreeMultCO.code
+                  COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
+                  ${CMAKE_CURRENT_SOURCE_DIR}/kerDevFreeMultCO.cc
+                  -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevFreeMultCO.code
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
+add_custom_target(kerDevAllocSingleKer.code
+                  COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
+                  ${CMAKE_CURRENT_SOURCE_DIR}/kerDevAllocSingleKer.cc
+                  -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/deviceLib/kerDevAllocSingleKer.code
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 if(HIP_PLATFORM MATCHES "amd")
     if (DEFINED OFFLOAD_ARCH_STR)
@@ -108,6 +122,4 @@ elseif(HIP_PLATFORM MATCHES "nvidia")
                       COMPILE_OPTIONS --Wno-deprecated-declarations)
 endif()
 
-if(UNIX)
-    add_dependencies(build_tests kerDevAllocMultCO.code kerDevWriteMultCO.code kerDevFreeMultCO.code kerDevAllocSingleKer.code)
-endif()
+add_dependencies(build_tests kerDevAllocMultCO.code kerDevWriteMultCO.code kerDevFreeMultCO.code kerDevAllocSingleKer.code)