diff --git a/catch/unit/module/hipExtModuleLaunchKernel.cc b/catch/unit/module/hipExtModuleLaunchKernel.cc
index 5121b17667..1a2766dca0 100644
--- a/catch/unit/module/hipExtModuleLaunchKernel.cc
+++ b/catch/unit/module/hipExtModuleLaunchKernel.cc
@@ -745,12 +745,15 @@ bool ModuleLaunchKernel::ExtModule_Corner_tests() {
   unsigned int maxblockX = deviceProp.maxThreadsDim[0];
   unsigned int maxblockY = deviceProp.maxThreadsDim[1];
   unsigned int maxblockZ = deviceProp.maxThreadsDim[2];
+  unsigned int maxgridX = deviceProp.maxGridSize[0];
+  unsigned int maxgridY = deviceProp.maxGridSize[1];
+  unsigned int maxgridZ = deviceProp.maxGridSize[2];
   struct gridblockDim test[6] = {{1, 1, 1, maxblockX, 1, 1},
                                  {1, 1, 1, 1, maxblockY, 1},
                                  {1, 1, 1, 1, 1, maxblockZ},
-                                 {UINT32_MAX, 1, 1, 1, 1, 1},
-                                 {1, UINT32_MAX, 1, 1, 1, 1},
-                                 {1, 1, UINT32_MAX, 1, 1, 1}};
+                                 {maxgridX, 1, 1, 1, 1, 1},
+                                 {1, maxgridY, 1, 1, 1, 1},
+                                 {1, 1, maxgridZ, 1, 1, 1}};
 
   for (int i = 0; i < 6; i++) {
     err = hipExtModuleLaunchKernel(DummyKernel,