diff --git a/scripts/functional_tests/driver.sh b/scripts/functional_tests/driver.sh
index bbad1f7720..684e130262 100755
--- a/scripts/functional_tests/driver.sh
+++ b/scripts/functional_tests/driver.sh
@@ -181,19 +181,15 @@ TestRMA() {
   ExecTest  "teamctxget"       2       4            128       1024
   ExecTest  "teamctxget"       2       16           256       1024
 
-  ExecTest  "g"                2       1            1         1048576
-  ExecTest  "g"                2       1            1024      512
-  ExecTest  "g"                2       8            1         1048576
-  ExecTest  "g"                2       16           128       8
-  ExecTest  "g"                2       32           256       512
-  ExecTest  "g"                2       64           1024      8
+  ExecTest  "g"                2       1            1         128
+  ExecTest  "g"                2       1            1024      2
+  ExecTest  "g"                2       8            1         32
+  ExecTest  "g"                2       16           128       4
 
-  ExecTest  "p"                2       1            1         1048576
-  ExecTest  "p"                2       1            1024      512
-  ExecTest  "p"                2       8            1         1048576
-  ExecTest  "p"                2       16           128       8
-  ExecTest  "p"                2       32           256       512
-  ExecTest  "p"                2       64           1024      8
+  ExecTest  "p"                2       1            1         128
+  ExecTest  "p"                2       1            1024      2
+  ExecTest  "p"                2       8            1         32
+  ExecTest  "p"                2       16           128       4
 
   ################################ Non-Blocking ################################
 
diff --git a/src/memory/hip_allocator.hpp b/src/memory/hip_allocator.hpp
index c3f8b16c40..be4039b167 100644
--- a/src/memory/hip_allocator.hpp
+++ b/src/memory/hip_allocator.hpp
@@ -37,7 +37,8 @@
 #include "memory_allocator.hpp"
 
 // `hipDeviceMallocUncached` was introduced at ROCm 5.5
-#if HIP_VERSION_MAJOR >= 5 && HIP_VERSION_MINOR >= 5
+#if (HIP_VERSION_MAJOR > 5) || \
+    (HIP_VERSION_MAJOR == 5 && HIP_VERSION_MINOR >= 5)
 #define HIP_SUPPORTS_MALLOC_UNCACHED
 #endif
 namespace rocshmem {
diff --git a/src/reverse_offload/block_handle.hpp b/src/reverse_offload/block_handle.hpp
index 19174938c6..e0d3e61ec3 100644
--- a/src/reverse_offload/block_handle.hpp
+++ b/src/reverse_offload/block_handle.hpp
@@ -83,7 +83,7 @@ class DefaultBlockHandleProxy {
   ProxyT proxy_{};
 };
 
-using DefaultBlockHandleProxyT = DefaultBlockHandleProxy<HIPAllocator>;
+using DefaultBlockHandleProxyT = DefaultBlockHandleProxy<HIPDefaultFinegrainedAllocator>;
 
 template <typename ALLOCATOR>
 class BlockHandleProxy {
@@ -130,7 +130,7 @@ class BlockHandleProxy {
   size_t num_blocks_{};
 };
 
-using BlockHandleProxyT = BlockHandleProxy<HIPAllocator>;
+using BlockHandleProxyT = BlockHandleProxy<HIPDefaultFinegrainedAllocator>;
 
 }  // namespace rocshmem