diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux
index 63ddb3dcc6..81bb0509a0 100644
--- a/catch/hipTestMain/config/config_amd_linux
+++ b/catch/hipTestMain/config/config_amd_linux
@@ -214,7 +214,6 @@
         "Unit_hipModuleGetTexRef_Negative_Name_Is_Empty_String",
         "SWDEV-441785: Below tests failing in stress test on 05/01/24 ===",
         "Unit_hipMemcpyParam2DAsync_Positive_Basic",
-        "Unit_hipMemcpy2DAsync_Positive_Basic",
         "SWDEV-442583: Below tests failing in stress test on 12/01/24 ===",
         "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_Parameters",
         "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDevice",
@@ -225,7 +224,6 @@
         "Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters",
         "Unit_hipMemcpy3D_Positive_Synchronization_Behavior",
         "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior",
-        "Unit_hipMemcpy2D_Positive_Synchronization_Behavior",
         "Unit_hipMemcpyAsync_Positive_Synchronization_Behavior",
         "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior",
         "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows
index 09d786983f..b4fdc31f8d 100644
--- a/catch/hipTestMain/config/config_amd_windows
+++ b/catch/hipTestMain/config/config_amd_windows
@@ -366,7 +366,6 @@
         "Unit_hipGraphMemcpyNodeSetParams_Negative_Parameters",
         "Unit_hipMemcpy3D_Positive_Synchronization_Behavior",
         "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior",
-        "Unit_hipMemcpy2D_Positive_Synchronization_Behavior",
         "Unit_hipMemcpyAsync_Positive_Synchronization_Behavior",
         "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior",
         "Unit_Thread_Block_Tile_Dynamic_Getters_Positive_Basic",
diff --git a/catch/unit/memory/memcpy2d_tests_common.hh b/catch/unit/memory/memcpy2d_tests_common.hh
index 96f9a16e80..62d7667db6 100644
--- a/catch/unit/memory/memcpy2d_tests_common.hh
+++ b/catch/unit/memory/memcpy2d_tests_common.hh
@@ -90,7 +90,7 @@ void Memcpy2DDeviceToDeviceShell(F memcpy_func, const hipStream_t kernel_stream
   }
 
   LinearAllocGuard2D<int> src_alloc(cols * src_cols_mult, rows);
-  HIP_CHECK(hipSetDevice(src_device));
+  HIP_CHECK(hipSetDevice(dst_device));
   LinearAllocGuard2D<int> dst_alloc(cols, rows);
   HIP_CHECK(hipSetDevice(src_device));
   LinearAllocGuard<int> host_alloc(LinearAllocs::hipHostMalloc, dst_alloc.width() * rows);
@@ -181,6 +181,7 @@ void MemcpySyncBehaviorCheck(F memcpy_func, const bool should_sync,
   LaunchDelayKernel(std::chrono::milliseconds{300}, kernel_stream);
   HIP_CHECK(memcpy_func());
   if (should_sync) {
+    HIP_CHECK(hipStreamSynchronize(kernel_stream));
     HIP_CHECK(hipStreamQuery(kernel_stream));
   } else {
     HIP_CHECK_ERROR(hipStreamQuery(kernel_stream), hipErrorNotReady);