diff --git a/t/t_aes.c b/t/t_aes.c
index bfea79c..6a47573 100644
--- a/t/t_aes.c
+++ b/t/t_aes.c
@@ -39,7 +39,8 @@
 
 struct t_case {
 	const char *desc;
-	const uint8_t key[AES_BLOCK_LEN];
+	int keylen;
+	const uint8_t key[32];
 	const uint8_t ptext[AES_BLOCK_LEN];
 	const uint8_t ctext[AES_BLOCK_LEN];
 };
@@ -50,10 +51,55 @@ struct t_case {
 static struct t_case t_cases[] = {
 	/* FIPS-197 test vectors */
 	{
-		.desc	= "FIPS-197 C-1",
-		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, },
-		.ptext	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, },
-		.ctext	= { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30, 0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a, },
+		.desc	= "FIPS-197 C.1",
+		.keylen = 128,
+		.key	= {
+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+		},
+		.ptext	= {
+			0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+			0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+		},
+		.ctext	= {
+			0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30,
+			0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a,
+		},
+	},
+	{
+		.desc	= "FIPS-197 C.2",
+		.keylen = 192,
+		.key	= {
+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+		},
+		.ptext	= {
+			0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+			0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+		},
+		.ctext	= {
+			0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0,
+			0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91,
+		},
+	},
+	{
+		.desc	= "FIPS-197 C.3",
+		.keylen = 256,
+		.key	= {
+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+			0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+		},
+		.ptext	= {
+			0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+			0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+		},
+		.ctext	= {
+			0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf,
+			0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89,
+		},
 	},
 };
 
@@ -68,7 +114,7 @@ t_aes_enc(char **desc CRYB_UNUSED, void *arg)
 	aes_ctx ctx;
 
 	asprintf(desc, "%s (encrypt)", t->desc);
-	aes_init(&ctx, CIPHER_MODE_ENCRYPT, t->key, sizeof t->key);
+	aes_init(&ctx, CIPHER_MODE_ENCRYPT, t->key, t->keylen / 8);
 	aes_update(&ctx, t->ptext, AES_BLOCK_LEN, out);
 	aes_finish(&ctx);
 	return (t_compare_mem(t->ctext, out, AES_BLOCK_LEN));
@@ -82,7 +128,7 @@ t_aes_dec(char **desc CRYB_UNUSED, void *arg)
 	aes_ctx ctx;
 
 	asprintf(desc, "%s (decrypt)", t->desc);
-	aes_init(&ctx, CIPHER_MODE_DECRYPT, t->key, sizeof t->key);
+	aes_init(&ctx, CIPHER_MODE_DECRYPT, t->key, t->keylen / 8);
 	aes_update(&ctx, t->ctext, AES_BLOCK_LEN, out);
 	aes_finish(&ctx);
 	return (t_compare_mem(t->ptext, out, AES_BLOCK_LEN));