diff --git a/catch/perftests/memory/hipPerfMemFill.cc b/catch/perftests/memory/hipPerfMemFill.cc
index a5faaacf9d..5892c10f86 100644
--- a/catch/perftests/memory/hipPerfMemFill.cc
+++ b/catch/perftests/memory/hipPerfMemFill.cc
@@ -84,7 +84,7 @@ template<class T>
 class hipPerfMemFill {
  private:
   static constexpr int NUM_START = 27;
-  static constexpr int NUM_SIZE = 5;
+  static constexpr int NUM_SIZE = 4;
   static constexpr int NUM_ITER = 10;
   static constexpr double NUM_1GB = 1024.0 * 1024.0 * 1024.0;
   size_t totalSizes_[NUM_SIZE];
@@ -96,7 +96,7 @@ class hipPerfMemFill {
  public:
   hipPerfMemFill() {
     for (int i = 0; i < NUM_SIZE; i++) {
-       // 128M, 256M, 512M, 1024M, 2048M
+       // 128M, 256M, 512M, 1024M
       totalSizes_[i] = 1ull << (i + NUM_START);
     }
   }
diff --git a/catch/unit/memory/hipMemPoolApi.cc b/catch/unit/memory/hipMemPoolApi.cc
index da9b6ad6a2..ee85e4fc88 100644
--- a/catch/unit/memory/hipMemPoolApi.cc
+++ b/catch/unit/memory/hipMemPoolApi.cc
@@ -137,6 +137,8 @@ __global__ void kernel500ms_gfx11(float* hostRes, int clkRate) {
 
 TEST_CASE("Unit_hipMemPoolApi_BasicAlloc") {
   int mem_pool_support = 0;
+  HIP_CHECK(hipSetDevice(0));
+
   HIP_CHECK(hipDeviceGetAttribute(&mem_pool_support, hipDeviceAttributeMemoryPoolsSupported, 0));
   if (!mem_pool_support) {
     SUCCEED("Runtime doesn't support Memory Pool. Skip the test case.");