diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 60cd7b3..7f83314 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1287,7 +1287,7 @@
     scripts/config.py unset MBEDTLS_SSL_ENCRYPT_THEN_MAC
     # Enable stream (currently that's just the NULL pseudo-cipher (controlled by MBEDTLS_CIPHER_NULL_CIPHER))
     scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER
-    # Indirect dependencies
+    # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
     scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
 
@@ -1295,10 +1295,12 @@
 
     msg "test: default with only stream cipher"
     make test
+
+    # Not running ssl-opt.sh because most tests require a non-NULL ciphersuite.
 }
 
 component_test_tls1_2_default_stream_cipher_only_use_psa () {
-    msg "build: deafult with only stream cipher use psa"
+    msg "build: default with only stream cipher use psa"
 
     scripts/config.py set MBEDTLS_USE_PSA_CRYPTO
     # Disable AEAD (controlled by the presence of one of GCM_C, CCM_C, CHACHAPOLY_C)
@@ -1311,14 +1313,16 @@
     scripts/config.py unset MBEDTLS_SSL_ENCRYPT_THEN_MAC
     # Enable stream (currently that's just the NULL pseudo-cipher (controlled by MBEDTLS_CIPHER_NULL_CIPHER))
     scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER
-    # Indirect dependencies
+    # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
     scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
 
     make
 
-    msg "test: deafult with only stream cipher use psa"
+    msg "test: default with only stream cipher use psa"
     make test
+
+    # Not running ssl-opt.sh because most tests require a non-NULL ciphersuite.
 }
 
 component_test_tls1_2_default_cbc_legacy_cipher_only () {
@@ -1334,7 +1338,7 @@
     scripts/config.py unset MBEDTLS_SSL_ENCRYPT_THEN_MAC
     # Disable stream (currently that's just the NULL pseudo-cipher (controlled by MBEDTLS_CIPHER_NULL_CIPHER))
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
-    # Indirect dependencies
+    # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
     scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
 
@@ -1361,7 +1365,7 @@
     scripts/config.py unset MBEDTLS_SSL_ENCRYPT_THEN_MAC
     # Disable stream (currently that's just the NULL pseudo-cipher (controlled by MBEDTLS_CIPHER_NULL_CIPHER))
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
-    # Indirect dependencies
+    # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
     scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
 
@@ -1387,7 +1391,7 @@
     scripts/config.py set MBEDTLS_SSL_ENCRYPT_THEN_MAC
     # Disable stream (currently that's just the NULL pseudo-cipher (controlled by MBEDTLS_CIPHER_NULL_CIPHER))
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
-    # Indirect dependencies
+    # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
     scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
 
@@ -1414,7 +1418,7 @@
     scripts/config.py set MBEDTLS_SSL_ENCRYPT_THEN_MAC
     # Disable stream (currently that's just the NULL pseudo-cipher (controlled by MBEDTLS_CIPHER_NULL_CIPHER))
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
-    # Indirect dependencies
+    # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
     scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS