diff --git a/catch/unit/device/hipDeviceCanAccessPeer.cc b/catch/unit/device/hipDeviceCanAccessPeer.cc
index 6ef6ca5926..98e52acd5c 100644
--- a/catch/unit/device/hipDeviceCanAccessPeer.cc
+++ b/catch/unit/device/hipDeviceCanAccessPeer.cc
@@ -54,7 +54,14 @@ TEST_CASE("Unit_hipDeviceCanAccessPeer_positive") {
   int dev = GENERATE(range(0, HipTest::getGeviceCount()));
   int peerDev = GENERATE(range(0, HipTest::getGeviceCount()));
 
+  GENERATE_CAPTURE();
+  hipStream_t stream;
+  HIP_CHECK(hipStreamCreate(&stream));
+  BEGIN_CAPTURE(stream);
   HIP_CHECK(hipDeviceCanAccessPeer(&canAccessPeer, dev, peerDev));
+  END_CAPTURE(stream);
+  HIP_CHECK(hipStreamDestroy(stream));
+
   if (dev != peerDev) {
     REQUIRE(canAccessPeer >= 0);
   }
diff --git a/catch/unit/device/hipDeviceEnableDisablePeerAccess.cc b/catch/unit/device/hipDeviceEnableDisablePeerAccess.cc
index bf85cbe0e8..c97318d894 100644
--- a/catch/unit/device/hipDeviceEnableDisablePeerAccess.cc
+++ b/catch/unit/device/hipDeviceEnableDisablePeerAccess.cc
@@ -59,7 +59,15 @@ TEST_CASE("Unit_hipDeviceEnableDisablePeerAccess_positive") {
 
   if (dev != peerDev) {
     HIP_CHECK(hipSetDevice(dev));
+
+    GENERATE_CAPTURE();
+    hipStream_t stream;
+    HIP_CHECK(hipStreamCreate(&stream));
+    BEGIN_CAPTURE(stream);
     HIP_CHECK(hipDeviceCanAccessPeer(&canAccessPeer, dev, peerDev));
+    END_CAPTURE(stream);
+    HIP_CHECK(hipStreamDestroy(stream));
+
     if (canAccessPeer == 0) {
       HipTest::HIP_SKIP_TEST("Skipping because no P2P support");
       return;