diff --git a/tensorflow/lite/kernels/internal/averagepool_quantized_test.cc b/tensorflow/lite/kernels/internal/averagepool_quantized_test.cc
index 03813bccb27..c648d21b197 100644
--- a/tensorflow/lite/kernels/internal/averagepool_quantized_test.cc
+++ b/tensorflow/lite/kernels/internal/averagepool_quantized_test.cc
@@ -63,12 +63,14 @@ void CreateDataAndRunAveragePool(bool padding_same) {
   const int batch = UniformRandomInt(1, 2);
   const int input_depth = UniformRandomInt(1, 700);
   const int output_depth = input_depth;
-  const int input_width = UniformRandomInt(1, 30);
-  const int input_height = UniformRandomInt(1, 30);
+  const int input_width_offset = UniformRandomInt(1, 30);
+  const int input_height_offset = UniformRandomInt(1, 30);
   const int stride_width = UniformRandomInt(1, 10);
   const int stride_height = UniformRandomInt(1, 10);
   const int filter_width = UniformRandomInt(1, 10);
   const int filter_height = UniformRandomInt(1, 10);
+  const int input_width = input_width_offset + filter_width;
+  const int input_height = input_height_offset + filter_height;
   const int output_width =
       padding_same ? (input_width + stride_width - 1) / stride_width
                    : (input_width - filter_width + stride_width) / stride_width;
diff --git a/tensorflow/lite/kernels/internal/maxpool_quantized_test.cc b/tensorflow/lite/kernels/internal/maxpool_quantized_test.cc
index bbd91ce3a6f..84afd3ddd52 100644
--- a/tensorflow/lite/kernels/internal/maxpool_quantized_test.cc
+++ b/tensorflow/lite/kernels/internal/maxpool_quantized_test.cc
@@ -59,12 +59,14 @@ void CreateDataAndRunMaxPool(bool padding_same) {
   const int batch = UniformRandomInt(1, 2);
   const int input_depth = UniformRandomInt(1, 700);
   const int output_depth = input_depth;
-  const int input_width = UniformRandomInt(1, 30);
-  const int input_height = UniformRandomInt(1, 30);
+  const int input_width_offset = UniformRandomInt(1, 30);
+  const int input_height_offset = UniformRandomInt(1, 30);
   const int stride_width = UniformRandomInt(1, 10);
   const int stride_height = UniformRandomInt(1, 10);
   const int filter_width = UniformRandomInt(1, 10);
   const int filter_height = UniformRandomInt(1, 10);
+  const int input_width = input_width_offset + filter_width;
+  const int input_height = input_height_offset + filter_height;
   const int output_width =
       padding_same ? (input_width + stride_width - 1) / stride_width
                    : (input_width - filter_width + stride_width) / stride_width;