diff --git a/tests/catch/hipTestMain/config/config_amd_windows.json b/tests/catch/hipTestMain/config/config_amd_windows.json
index 47f36b7418..d60f72243c 100644
--- a/tests/catch/hipTestMain/config/config_amd_windows.json
+++ b/tests/catch/hipTestMain/config/config_amd_windows.json
@@ -29,7 +29,37 @@
 	   "Unit_hipTextureMipmapObj2D_Check",
 	   "Unit_hipStreamPerThread_DeviceReset_1",
 	   "Unit_hipStreamPerThread_DeviceReset_2",
-	   "Unit_hipManagedKeyword_MultiGpu"	   
+	   "Unit_hipManagedKeyword_MultiGpu",
+	   "Unit_hipGraphAddDependencies_Functional",
+	   "Unit_hipGraph_BasicFunctional",
+	   "Unit_hipGraphClone_Functional",
+	   "Unit_hipGraphClone_MultiThreaded",
+	   "Unit_hipGraphAddHostNode_ClonedGraphwithHostNode",
+	   "Unit_hipGraphAddHostNode_VectorSquare",
+	   "Unit_hipGraphAddHostNode_BasicFunc",
+	   "Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalMemory",
+	   "Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalConstMemory",
+	   "Unit_hipGraphAddMemcpyNodeFromSymbol_GlobalMemoryWithKernel",
+	   "Unit_hipGraphExecHostNodeSetParams_Negative",
+	   "Unit_hipGraphExecHostNodeSetParams_ClonedGraphwithHostNode",
+	   "Unit_hipGraphExecHostNodeSetParams_BasicFunc",
+	   "Unit_hipGraphAddMemcpyNodeToSymbol_GlobalMemory",
+	   "Unit_hipGraphAddMemcpyNodeToSymbol_GlobalConstMemory",
+	   "Unit_hipGraphAddMemcpyNodeToSymbol_MemcpyToSymbolNodeWithKernel",
+	   "Unit_hipGraphDestroyNode_DestroyDependencyNode",
+	   "Unit_hipGraphGetNodes_Functional",
+	   "Unit_hipGraphGetRootNodes_Functional",
+	   "Unit_hipGraphHostNodeSetParams_ClonedGraphwithHostNode",
+	   "Unit_hipGraphAddChildGraphNode_OrgGraphAsChildGraph",
+	   "Unit_hipGraphAddChildGraphNode_SingleChildNode",
+	   "Unit_hipGraphExecMemcpyNodeSetParams1D_Functional",
+	   "Unit_hipGraphRemoveDependencies_ChangeComputeFunc",
+	   "Unit_hipGraphExecUpdate_Negative_CountDiffer",
+	   "Unit_hipGraphExecUpdate_Functional",
+	   "Unit_hipGraphExecEventRecordNodeSetEvent_Negative",
+	   "Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Negative",
+	   "Unit_hipGraphExecMemcpyNodeSetParamsFromSymbol_Functional",
+	   "Unit_hipPtrGetAttribute_Simple"
 	]
 
 }
diff --git a/tests/catch/unit/CMakeLists.txt b/tests/catch/unit/CMakeLists.txt
index 8506e67781..60a2941124 100644
--- a/tests/catch/unit/CMakeLists.txt
+++ b/tests/catch/unit/CMakeLists.txt
@@ -20,12 +20,11 @@
 
 # build fails in windows
 if (UNIX)
-  add_subdirectory(memory)
-  add_subdirectory(graph)
   add_subdirectory(rtc)
   add_subdirectory(deviceLib)
 endif()
-
+add_subdirectory(graph)
+add_subdirectory(memory)
 add_subdirectory(stream)
 add_subdirectory(event)
 add_subdirectory(occupancy)
diff --git a/tests/catch/unit/memory/CMakeLists.txt b/tests/catch/unit/memory/CMakeLists.txt
index 5a5f48df72..4a9f3f9607 100644
--- a/tests/catch/unit/memory/CMakeLists.txt
+++ b/tests/catch/unit/memory/CMakeLists.txt
@@ -57,7 +57,6 @@ set(TEST_SRC
     hipMemCoherencyTst.cc
     hipMallocManaged.cc
     hipMemRangeGetAttribute.cc
-    hipHmmOvrSubscriptionTst.cc
     hipMemcpyFromSymbol.cc
     hipMemcpyFromSymbolAsync.cc
     hipMemcpyToSymbol.cc
@@ -99,7 +98,6 @@ set(TEST_SRC
     hipMemAdviseMmap.cc
     hipMallocManaged.cc
     hipMemRangeGetAttribute.cc
-    hipHmmOvrSubscriptionTst.cc
     hipMemcpyFromSymbol.cc
     hipMemcpyFromSymbolAsync.cc
     hipMemcpyToSymbol.cc
@@ -124,7 +122,8 @@ if(UNIX)
                  hipMemoryAllocateCoherent.cc
                  hipHostMalloc.cc
                  hipMemcpy.cc
-                 hipMemcpyAsync.cc)
+                 hipMemcpyAsync.cc
+                 hipHmmOvrSubscriptionTst.cc)
 endif()
 
 hip_add_exe_to_target(NAME MemoryTest
diff --git a/tests/catch/unit/memory/hipMemset3DFunctional.cc b/tests/catch/unit/memory/hipMemset3DFunctional.cc
index 35d5696bc4..20e97278e5 100644
--- a/tests/catch/unit/memory/hipMemset3DFunctional.cc
+++ b/tests/catch/unit/memory/hipMemset3DFunctional.cc
@@ -242,7 +242,7 @@ static void seekAndSet3DArraySlice(bool bAsync) {
 
   // select random slice for memset
   unsigned int seed = time(nullptr);
-  int slice_index = rand_r(&seed) % ZSIZE_S;
+  int slice_index = HipTest::RAND_R(&seed) % ZSIZE_S;
 
   INFO("memset3d for sliceindex " << slice_index);