diff --git a/src/gtest/include/mesa-gtest-extras.h b/src/gtest/include/mesa-gtest-extras.h
index ca3c5a9654d..71103fde6a7 100644
--- a/src/gtest/include/mesa-gtest-extras.h
+++ b/src/gtest/include/mesa-gtest-extras.h
@@ -57,7 +57,7 @@ array_equal_pred(const char *a_expr,
             result << "\n  [" << std::dec << std::setw(3) << i << "]";
          result << " "
                 << (a[i] == b[i] ? ' ' : '*')
-                << std::hex << std::setw(2) << +a[i];
+                << std::hex << std::setw(sizeof(T) * 2) << +a[i];
       }
       result << "\n\n";