diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 242256b..63b4e0a 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3449,28 +3449,44 @@
 }
 
 component_test_aes_only_128_bit_keys () {
-    msg "build: default config with AES_ONLY_128_BIT_KEY_LENGTH enabled"
+    msg "build: default config + AES_ONLY_128_BIT_KEY_LENGTH"
     scripts/config.py set MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
     scripts/config.py unset MBEDTLS_PADLOCK_C
 
     make CC=gcc CFLAGS='-Werror -Wall -Wextra'
 
-    msg "test: AES_ONLY_128_BIT_KEY_LENGTH"
+    msg "test: default config + AES_ONLY_128_BIT_KEY_LENGTH"
     make test
 }
 
 component_test_no_ctr_drbg_aes_only_128_bit_keys () {
-    msg "build: default config with AES_ONLY_128_BIT_KEY_LENGTH enabled and MBEDTLS_CTR_DRBG_C disabled"
+    msg "build: default config + AES_ONLY_128_BIT_KEY_LENGTH - CTR_DRBG_C"
     scripts/config.py set MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
     scripts/config.py unset MBEDTLS_CTR_DRBG_C
     scripts/config.py unset MBEDTLS_PADLOCK_C
 
     make CC=gcc CFLAGS='-Werror -Wall -Wextra'
 
-    msg "test: AES_ONLY_128_BIT_KEY_LENGTH without MBEDTLS_CTR_DRBG_C"
+    msg "test: default config + AES_ONLY_128_BIT_KEY_LENGTH - CTR_DRBG_C"
     make test
 }
 
+component_test_aes_only_128_bit_keys_have_builtins () {
+    msg "build: default config + AES_ONLY_128_BIT_KEY_LENGTH - AESNI_C - AESCE_C"
+    scripts/config.py set MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
+    scripts/config.py unset MBEDTLS_PADLOCK_C
+    scripts/config.py unset MBEDTLS_AESNI_C
+    scripts/config.py unset MBEDTLS_AESCE_C
+
+    make CC=gcc CFLAGS='-Werror -Wall -Wextra'
+
+    msg "test: default config + AES_ONLY_128_BIT_KEY_LENGTH - AESNI_C - AESCE_C"
+    make test
+
+    msg "selftest: default config + AES_ONLY_128_BIT_KEY_LENGTH - AESNI_C - AESCE_C"
+    programs/test/selftest
+}
+
 component_test_aes_fewer_tables () {
     msg "build: default config with AES_FEWER_TABLES enabled"
     scripts/config.py set MBEDTLS_AES_FEWER_TABLES