diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux
index 92795fd616..e313c09867 100644
--- a/catch/hipTestMain/config/config_amd_linux
+++ b/catch/hipTestMain/config/config_amd_linux
@@ -309,10 +309,6 @@
         "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "Unit_hipLaunchCooperativeKernel_Negative_Parameters",
-        "Performance_hipMemsetD16",
-        "Performance_hipMemsetD16Async",
-        "Performance_hipMemsetD32",
-        "Performance_hipMemsetD32Async",
         "Unit_hipDeviceGetGraphMemAttribute_Positive_ReuseMemory",
         "Unit_hipGraphAddNodeTypeEventWait_Positive_Basic",
         "Unit_hipDrvGraphAddMemsetNode_Negative_Parameters",
diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows
index c9090bac58..a15289d13c 100644
--- a/catch/hipTestMain/config/config_amd_windows
+++ b/catch/hipTestMain/config/config_amd_windows
@@ -387,10 +387,6 @@
         "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
         "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
-        "Performance_hipMemsetD16",
-        "Performance_hipMemsetD16Async",
-        "Performance_hipMemsetD32",
-        "Performance_hipMemsetD32Async",
         "Performance_hipMemcpy2D_HostToHost",
         "Performance_hipMemcpy2DAsync_HostToHost",
         "Unit_hipDeviceGetGraphMemAttribute_Positive_ReuseMemory",
diff --git a/catch/performance/memset/hipMemsetD16.cc b/catch/performance/memset/hipMemsetD16.cc
index 6388a2e032..221f8f1176 100644
--- a/catch/performance/memset/hipMemsetD16.cc
+++ b/catch/performance/memset/hipMemsetD16.cc
@@ -33,7 +33,7 @@ THE SOFTWARE.
 class MemsetD16Benchmark : public Benchmark<MemsetD16Benchmark> {
  public:
   MemsetD16Benchmark(LinearAllocs allocation_type, size_t size)
-      : dst_(allocation_type, size), size_(size) {}
+      : dst_(allocation_type, size * sizeof(int16_t)), size_(size) {}
 
   void operator()() {
     TIMED_SECTION(kTimerTypeEvent) {
diff --git a/catch/performance/memset/hipMemsetD16Async.cc b/catch/performance/memset/hipMemsetD16Async.cc
index ee6f6e39fb..cf6cdcbfb8 100644
--- a/catch/performance/memset/hipMemsetD16Async.cc
+++ b/catch/performance/memset/hipMemsetD16Async.cc
@@ -33,7 +33,7 @@ THE SOFTWARE.
 class MemsetD16AsyncBenchmark : public Benchmark<MemsetD16AsyncBenchmark> {
  public:
   MemsetD16AsyncBenchmark(LinearAllocs allocation_type, size_t size)
-      : dst_(allocation_type, size), size_(size), stream_(Streams::created) {}
+      : dst_(allocation_type, size * sizeof(int16_t)), size_(size), stream_(Streams::created) {}
 
   void operator()() {
     TIMED_SECTION_STREAM(kTimerTypeEvent, stream_.stream()) {
diff --git a/catch/performance/memset/hipMemsetD32.cc b/catch/performance/memset/hipMemsetD32.cc
index 12a325afe8..fba1ba2547 100644
--- a/catch/performance/memset/hipMemsetD32.cc
+++ b/catch/performance/memset/hipMemsetD32.cc
@@ -33,7 +33,7 @@ THE SOFTWARE.
 class MemsetD32Benchmark : public Benchmark<MemsetD32Benchmark> {
  public:
   MemsetD32Benchmark(LinearAllocs allocation_type, size_t size)
-      : dst_(allocation_type, size), size_(size) {}
+      : dst_(allocation_type, size * sizeof(int32_t)), size_(size) {}
 
   void operator()() {
     TIMED_SECTION(kTimerTypeEvent) {
diff --git a/catch/performance/memset/hipMemsetD32Async.cc b/catch/performance/memset/hipMemsetD32Async.cc
index e097fe1772..66124aaa74 100644
--- a/catch/performance/memset/hipMemsetD32Async.cc
+++ b/catch/performance/memset/hipMemsetD32Async.cc
@@ -33,7 +33,7 @@ THE SOFTWARE.
 class MemsetD32AsyncBenchmark : public Benchmark<MemsetD32AsyncBenchmark> {
  public:
   MemsetD32AsyncBenchmark(LinearAllocs allocation_type, size_t size)
-      : dst_(allocation_type, size), size_(size), stream_(Streams::created) {}
+      : dst_(allocation_type, size * sizeof(int32_t)), size_(size), stream_(Streams::created) {}
 
   void operator()() {
     TIMED_SECTION_STREAM(kTimerTypeEvent, stream_.stream()) {