diff --git a/library/aes.c b/library/aes.c
index b5e8924..9063869 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1271,6 +1271,11 @@
             aes_tests = aes_test_ecb_enc[u];
         }
 
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
         if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
         {
             mbedtls_printf( "skipped\n" );
@@ -1330,6 +1335,11 @@
             aes_tests = aes_test_cbc_enc[u];
         }
 
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
         if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
         {
             mbedtls_printf( "skipped\n" );
@@ -1390,6 +1400,11 @@
 
         offset = 0;
         ret = mbedtls_aes_setkey_enc( &ctx, key, keybits );
+        /*
+         * AES-192 is an optional feature that may be unavailable when
+         * there is an alternative underlying implementation i.e. when
+         * MBEDTLS_AES_ALT is defined.
+         */
         if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && keybits == 192 )
         {
             mbedtls_printf( "skipped\n" );
diff --git a/library/gcm.c b/library/gcm.c
index 7b2760a..97e9d88 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -757,6 +757,11 @@
 
             ret = mbedtls_gcm_setkey( &ctx, cipher, key[key_index[i]],
                                       key_len );
+            /*
+             * AES-192 is an optional feature that may be unavailable when
+             * there is an alternative underlying implementation i.e. when
+             * MBEDTLS_AES_ALT is defined.
+             */
             if( ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE && key_len == 192 )
             {
                 mbedtls_printf( "skipped\n" );
