diff --git a/tests/suites/test_suite_md.data b/tests/suites/test_suite_md.data
index e9500cf..fd6c10d 100644
--- a/tests/suites/test_suite_md.data
+++ b/tests/suites/test_suite_md.data
@@ -585,70 +585,6 @@
 depends_on:MBEDTLS_SHA3_C
 mbedtls_md_hmac:"SHA3-512":32:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e2c2077697468207472756e636174656420746167":"7bb06d859257b25ce73ca700df34c5cbef5c898bac91029e0b27975d4e526a08"
 
-HMAC-SHA-224: NIST example #1: keylen=blocklen
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA224":28:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"c7405e3ae058e8cd30b08b4140248581ed174cb34e1224bcc1efc81b"
-
-HMAC-SHA-224: NIST example #2: keylen<blocklen
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA224":28:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e":"e3d249a8cfb67ef8b7a169e9a0a599714a2cecba65999a51beb8fbbe"
-
-HMAC-SHA-224: NIST example #3: keylen>blocklen
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA224":28:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f60616263":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"91c52509e5af8531601ae6230099d90bef88aaefb961f4080abc014d"
-
-HMAC-SHA-224: NIST example #4: keylen<blocklen, with truncated tag
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA224":16:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e2c2077697468207472756e636174656420746167":"d522f1df596ca4b4b1c23d27bde067d6"
-
-HMAC-SHA-256: NIST example #1: keylen=blocklen
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA256":32:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"8bb9a1db9806f20df7f77b82138c7914d174d59e13dc4d0169c9057b133e1d62"
-
-HMAC-SHA-256: NIST example #2: keylen<blocklen
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA256":32:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e":"a28cf43130ee696a98f14a37678b56bcfcbdd9e5cf69717fecf5480f0ebdf790"
-
-HMAC-SHA-256: NIST example #3: keylen>blocklen
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA256":32:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f60616263":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"bdccb6c72ddeadb500ae768386cb38cc41c63dbb0878ddb9c7a38a431b78378d"
-
-HMAC-SHA-256: NIST example #4: keylen<blocklen, with truncated tag
-depends_on:MBEDTLS_SHA256_C
-mbedtls_md_hmac:"SHA256":16:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e2c2077697468207472756e636174656420746167":"27a8b157839efeac98df070b331d5936"
-
-HMAC-SHA-384: NIST example #1: keylen=blocklen
-depends_on:MBEDTLS_SHA384_C
-mbedtls_md_hmac:"SHA384":48:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"63c5daa5e651847ca897c95814ab830bededc7d25e83eef9195cd45857a37f448947858f5af50cc2b1b730ddf29671a9"
-
-HMAC-SHA-384: NIST example #2: keylen<blocklen
-depends_on:MBEDTLS_SHA384_C
-mbedtls_md_hmac:"SHA384":48:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e":"6eb242bdbb582ca17bebfa481b1e23211464d2b7f8c20b9ff2201637b93646af5ae9ac316e98db45d9cae773675eeed0"
-
-HMAC-SHA-384: NIST example #3: keylen>blocklen
-depends_on:MBEDTLS_SHA384_C
-mbedtls_md_hmac:"SHA384":48:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"5b664436df69b0ca22551231a3f0a3d5b4f97991713cfa84bff4d0792eff96c27dccbbb6f79b65d548b40e8564cef594"
-
-HMAC-SHA-384: NIST example #4: keylen<blocklen, with truncated tag
-depends_on:MBEDTLS_SHA384_C
-mbedtls_md_hmac:"SHA384":24:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e2c2077697468207472756e636174656420746167":"c48130d3df703dd7cdaa56800dfbd2ba2458320e6e1f98fe"
-
-HMAC-SHA-512: NIST example #1: keylen=blocklen
-depends_on:MBEDTLS_SHA512_C
-mbedtls_md_hmac:"SHA512":64:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"fc25e240658ca785b7a811a8d3f7b4ca48cfa26a8a366bf2cd1f836b05fcb024bd36853081811d6cea4216ebad79da1cfcb95ea4586b8a0ce356596a55fb1347"
-
-HMAC-SHA-512: NIST example #2: keylen<blocklen
-depends_on:MBEDTLS_SHA512_C
-mbedtls_md_hmac:"SHA512":64:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e":"fd44c18bda0bb0a6ce0e82b031bf2818f6539bd56ec00bdc10a8a2d730b3634de2545d639b0f2cf710d0692c72a1896f1f211c2b922d1a96c392e07e7ea9fedc"
-
-HMAC-SHA-512: NIST example #3: keylen>blocklen
-depends_on:MBEDTLS_SHA512_C
-mbedtls_md_hmac:"SHA512":64:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7":"53616d706c65206d65737361676520666f72206b65796c656e3d626c6f636b6c656e":"d93ec8d2de1ad2a9957cb9b83f14e76ad6b5e0cce285079a127d3b14bccb7aa7286d4ac0d4ce64215f2bc9e6870b33d97438be4aaa20cda5c5a912b48b8e27f3"
-
-HMAC-SHA-512: NIST example #4: keylen<blocklen, with truncated tag
-depends_on:MBEDTLS_SHA512_C
-mbedtls_md_hmac:"SHA512":32:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f30":"53616d706c65206d65737361676520666f72206b65796c656e3c626c6f636b6c656e2c2077697468207472756e636174656420746167":"00f3e9a77bb0f06de15f160603e42b5028758808596664c03e1ab8fb2b076778"
-
 generic multi step HMAC-SHA-1 Test Vector FIPS-198a #1
 depends_on:MBEDTLS_SHA1_C
 md_hmac_multi:"SHA1":20:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f":"53616d706c65202331":"4f4ca3d5d68ba7cc0a1208c9c61e9c5da0403c0a"