diff --git a/ChangeLog b/ChangeLog
index 7fca2a2f8539b40c55a929904b949480c92dd037..157a4e0d62e82a51ebd778a815ed0955821213d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-19  Niels Möller  <nisse@lysator.liu.se>
 
+	* testsuite/meta-hash-test.c (test_main): Validate
+	NETTLE_MAX_HASH_DIGEST_SIZE.
+
 	* pbkdf2.h (PBKDF2): New macro.
 	* testsuite/pbkdf2-test.c: Use it.
 
diff --git a/testsuite/meta-hash-test.c b/testsuite/meta-hash-test.c
index d3dba642ab0b0ad5af0d9c74b336e71554051045..68debeef65a384fffd1fe6b7f57a78d39fa2eaaf 100644
--- a/testsuite/meta-hash-test.c
+++ b/testsuite/meta-hash-test.c
@@ -1,4 +1,5 @@
 #include "testutils.h"
+#include "nettle-internal.h"
 #include "nettle-meta.h"
 
 const char* hashes[] = {
@@ -29,5 +30,7 @@ test_main(void)
   while (NULL != nettle_hashes[j])
     j++;
   ASSERT(j == count); /* we are not missing testing any hashes */
+  for (j = 0; NULL != nettle_hashes[j]; j++)
+    ASSERT(nettle_hashes[j]->digest_size <= NETTLE_MAX_HASH_DIGEST_SIZE);
 }