diff --git a/src/post_modules/Nettle/testsuite.in b/src/post_modules/Nettle/testsuite.in
index 2a40d83245147e5274c3fc41f6e8acd695edfec3..32c8470e6d53461c5dc3a637e8f1a5336b23a167 100644
--- a/src/post_modules/Nettle/testsuite.in
+++ b/src/post_modules/Nettle/testsuite.in
@@ -104,7 +104,17 @@ define(test_mac, [[
   ]])
 ]])
 
-dnl MD5-HMAC Test vectors from RFC 2104.
+dnl key, [nonce], input,
+dnl hmac-sha224, hmac-sha256, hmac-sha384, hmac-sha512,
+dnl [truncation]
+define(test_hmac_sha2, [[
+  test_mac(Crypto.SHA224.HMAC,$1,$2,$3,$4,$8)
+  test_mac(Crypto.SHA256.HMAC,$1,$2,$3,$5,$8)
+  test_mac(Crypto.SHA384.HMAC,$1,$2,$3,$6,$8)
+  test_mac(Crypto.SHA512.HMAC,$1,$2,$3,$7,$8)
+]])
+
+dnl HMAC-MD5 Test vectors from RFC 2104.
 
 test_mac(Crypto.MD5.HMAC,
 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b,,
@@ -125,165 +135,94 @@ DDDDDDDDDDDDDDDDDDDD
 DDDDDDDDDDDDDDDDDDDD,
 56be34521d144c88dbb8c733f0e8b3f6)
 
-dnl FIXME: Test vectors for Crypto.SHA1.HMAC.
-
-dnl SHA2-HMAC Test vectors from RFC 4231.
+dnl HMAC-SHA1 Test vectors from RFC 2202.
 
-test_mac(Crypto.SHA224.HMAC,
+test_mac(Crypto.SHA1.HMAC,
 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b,,
 4869205468657265,
-896fb1128abbdf196832107cd49df33f
-47b4b1169912ba4f53684b22)
-test_mac(Crypto.SHA256.HMAC,
-0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b,,
+b617318655057264e28bc0b6fb378c8ef146be00)
+
+test_mac(Crypto.SHA1.HMAC,
+4a656665,,
+7768617420646f2079612077616e7420666f72206e6f7468696e673f,
+effcdf6ae5eb2fa2d27416d5f184df9c259a7c79)
+
+dnl HMAC-SHA2 Test vectors from RFC 4231.
+
+test_hmac_sha2(0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b,,
 4869205468657265,
+896fb1128abbdf196832107cd49df33f
+47b4b1169912ba4f53684b22,
 b0344c61d8db38535ca8afceaf0bf12b
-881dc200c9833da726e9376c2e32cff7)
-test_mac(Crypto.SHA384.HMAC,
-0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b,,
-4869205468657265,
+881dc200c9833da726e9376c2e32cff7,
 afd03944d84895626b0825f4ab46907f
 15f9dadbe4101ec682aa034c7cebc59c
-faea9ea9076ede7f4af152e8b2fa9cb6)
-test_mac(Crypto.SHA512.HMAC,
-0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b,,
-4869205468657265,
+faea9ea9076ede7f4af152e8b2fa9cb6,
 87aa7cdea5ef619d4ff0b4241a1d6cb0
 2379f4e2ce4ec2787ad0b30545e17cde
 daa833b7d6b8a702038b274eaea3f4e4
 be9d914eeb61f1702e696c203a126854)
 
-test_mac(Crypto.SHA224.HMAC,
-4a656665,,
+test_hmac_sha2(4a656665,,
 7768617420646f2079612077616e7420
 666f72206e6f7468696e673f,
 a30e01098bc6dbbf45690f3a7e9e6d0f
-8bbea2a39e6148008fd05e44)
-test_mac(Crypto.SHA256.HMAC,
-4a656665,,
-7768617420646f2079612077616e7420
-666f72206e6f7468696e673f,
+8bbea2a39e6148008fd05e44,
 5bdcc146bf60754e6a042426089575c7
-5a003f089d2739839dec58b964ec3843)
-test_mac(Crypto.SHA384.HMAC,
-4a656665,,
-7768617420646f2079612077616e7420
-666f72206e6f7468696e673f,
+5a003f089d2739839dec58b964ec3843,
 af45d2e376484031617f78d2b58a6b1b
 9c7ef464f5a01b47e42ec3736322445e
-8e2240ca5e69e2c78b3239ecfab21649)
-test_mac(Crypto.SHA512.HMAC,
-4a656665,,
-7768617420646f2079612077616e7420
-666f72206e6f7468696e673f,
+8e2240ca5e69e2c78b3239ecfab21649,
 164b7a7bfcf819e2e395fbe73b56e0a3
 87bd64222e831fd610270cd7ea250554
 9758bf75c05a994a6d034f65f8f0e6fd
 caeab1a34d4a6b4b636e070a38bce737)
 
-test_mac(Crypto.SHA224.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,,
+test_hmac_sha2(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,,
 dddddddddddddddddddddddddddddddd
 dddddddddddddddddddddddddddddddd
 dddddddddddddddddddddddddddddddd
 dddd,
 7fb3cb3588c6c1f6ffa9694d7d6ad264
-9365b0c1f65d69d1ec8333ea)
-test_mac(Crypto.SHA256.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,,
-dddddddddddddddddddddddddddddddd
-dddddddddddddddddddddddddddddddd
-dddddddddddddddddddddddddddddddd
-dddd,
+9365b0c1f65d69d1ec8333ea,
 773ea91e36800e46854db8ebd09181a7
-2959098b3ef8c122d9635514ced565fe)
-test_mac(Crypto.SHA384.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,,
-dddddddddddddddddddddddddddddddd
-dddddddddddddddddddddddddddddddd
-dddddddddddddddddddddddddddddddd
-dddd,
+2959098b3ef8c122d9635514ced565fe,
 88062608d3e6ad8a0aa2ace014c8a86f
 0aa635d947ac9febe83ef4e55966144b
-2a5ab39dc13814b94e3ab6e101a34f27)
-test_mac(Crypto.SHA512.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,,
-dddddddddddddddddddddddddddddddd
-dddddddddddddddddddddddddddddddd
-dddddddddddddddddddddddddddddddd
-dddd,
+2a5ab39dc13814b94e3ab6e101a34f27,
 fa73b0089d56a284efb0f0756c890be9
 b1b5dbdd8ee81a3655f83e33b2279d39
 bf3e848279a722c806b485a47e67c807
 b946a337bee8942674278859e13292fb)
 
-test_mac(Crypto.SHA224.HMAC,
-0102030405060708090a0b0c0d0e0f10
+test_hmac_sha2(0102030405060708090a0b0c0d0e0f10
 111213141516171819,,
 cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
 cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
 cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
 cdcd,
 6c11506874013cac6a2abc1bb382627c
-ec6a90d86efc012de7afec5a)
-test_mac(Crypto.SHA256.HMAC,
-0102030405060708090a0b0c0d0e0f10
-111213141516171819,,
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcd,
+ec6a90d86efc012de7afec5a,
 82558a389a443c0ea4cc819899f2083a
-85f0faa3e578f8077a2e3ff46729665b)
-test_mac(Crypto.SHA384.HMAC,
-0102030405060708090a0b0c0d0e0f10
-111213141516171819,,
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcd,
+85f0faa3e578f8077a2e3ff46729665b,
 3e8a69b7783c25851933ab6290af6ca7
 7a9981480850009cc5577c6e1f573b4e
-6801dd23c4a7d679ccf8a386c674cffb)
-test_mac(Crypto.SHA512.HMAC,
-0102030405060708090a0b0c0d0e0f10
-111213141516171819,,
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
-cdcd,
+6801dd23c4a7d679ccf8a386c674cffb,
 b0ba465637458c6990e5a8c5f61d4af7
 e576d97ff94b872de76f8050361ee3db
 a91ca5c11aa25eb4d679275cc5788063
 a5f19741120c4f2de2adebeb10a298dd)
 
-test_mac(Crypto.SHA224.HMAC,
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-0c0c0c0c,,
-546573742057697468205472756e6361
-74696f6e,
-0e2aea68a90c8d37c988bcdb9fca6fa8, 16)
-test_mac(Crypto.SHA256.HMAC,
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-0c0c0c0c,,
-546573742057697468205472756e6361
-74696f6e,
-a3b6167473100ee06e0c796c2955552b, 16)
-test_mac(Crypto.SHA384.HMAC,
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-0c0c0c0c,,
-546573742057697468205472756e6361
-74696f6e,
-3abf34c3503b2a23a46efc619baef897, 16)
-test_mac(Crypto.SHA512.HMAC,
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
+test_hmac_sha2(0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
 0c0c0c0c,,
 546573742057697468205472756e6361
 74696f6e,
+0e2aea68a90c8d37c988bcdb9fca6fa8,
+a3b6167473100ee06e0c796c2955552b,
+3abf34c3503b2a23a46efc619baef897,
 415fad6271580a531d4179bc891d87a6, 16)
 
-test_mac(Crypto.SHA224.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+test_hmac_sha2(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -297,61 +236,18 @@ aaaaaa,,
 65204b6579202d2048617368204b6579
 204669727374,
 95e9a0db962095adaebe9b2d6f0dbce2
-d499f112f2d2b7273fa6870e)
-test_mac(Crypto.SHA256.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaa,,
-54657374205573696e67204c61726765
-72205468616e20426c6f636b2d53697a
-65204b6579202d2048617368204b6579
-204669727374,
+d499f112f2d2b7273fa6870e,
 60e431591ee0b67f0d8a26aacbf5b77f
-8e0bc6213728c5140546040f0ee37f54)
-test_mac(Crypto.SHA384.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaa,,
-54657374205573696e67204c61726765
-72205468616e20426c6f636b2d53697a
-65204b6579202d2048617368204b6579
-204669727374,
+8e0bc6213728c5140546040f0ee37f54,
 4ece084485813e9088d2c63a041bc5b4
 4f9ef1012a2b588f3cd11f05033ac4c6
-0c2ef6ab4030fe8296248df163f44952)
-test_mac(Crypto.SHA512.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaa,,
-54657374205573696e67204c61726765
-72205468616e20426c6f636b2d53697a
-65204b6579202d2048617368204b6579
-204669727374,
+0c2ef6ab4030fe8296248df163f44952,
 80b24263c7c1a3ebb71493c1dd7be8b4
 9b46d1f41b4aeec1121b013783f8f352
 6b56d037e05f2598bd0fd2215d6a1e52
 95e64f73f63f0aec8b915a985d786598)
 
-test_mac(Crypto.SHA224.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+test_hmac_sha2(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -371,72 +267,12 @@ aaaaaa,,
 642062792074686520484d414320616c
 676f726974686d2e,
 3a854166ac5d9f023f54d517d0b39dbd
-946770db9c2b95c9f6f565d1)
-test_mac(Crypto.SHA256.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaa,,
-54686973206973206120746573742075
-73696e672061206c6172676572207468
-616e20626c6f636b2d73697a65206b65
-7920616e642061206c61726765722074
-68616e20626c6f636b2d73697a652064
-6174612e20546865206b6579206e6565
-647320746f2062652068617368656420
-6265666f7265206265696e6720757365
-642062792074686520484d414320616c
-676f726974686d2e,
+946770db9c2b95c9f6f565d1,
 9b09ffa71b942fcb27635fbcd5b0e944
-bfdc63644f0713938a7f51535c3a35e2)
-test_mac(Crypto.SHA384.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaa,,
-54686973206973206120746573742075
-73696e672061206c6172676572207468
-616e20626c6f636b2d73697a65206b65
-7920616e642061206c61726765722074
-68616e20626c6f636b2d73697a652064
-6174612e20546865206b6579206e6565
-647320746f2062652068617368656420
-6265666f7265206265696e6720757365
-642062792074686520484d414320616c
-676f726974686d2e,
+bfdc63644f0713938a7f51535c3a35e2,
 6617178e941f020d351e2f254e8fd32c
 602420feb0b8fb9adccebb82461e99c5
-a678cc31e799176d3860e6110c46523e)
-test_mac(Crypto.SHA512.HMAC,
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaa,,
-54686973206973206120746573742075
-73696e672061206c6172676572207468
-616e20626c6f636b2d73697a65206b65
-7920616e642061206c61726765722074
-68616e20626c6f636b2d73697a652064
-6174612e20546865206b6579206e6565
-647320746f2062652068617368656420
-6265666f7265206265696e6720757365
-642062792074686520484d414320616c
-676f726974686d2e,
+a678cc31e799176d3860e6110c46523e,
 e37b6a775dc87dbaa4dfa9f96e5e3ffd
 debd71f8867289865df5a32d20cdc944
 b6022cac3c4982b10d5eeb55c3e4de15