diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 816c211..40f9253 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -812,6 +812,11 @@
 #error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites"
 #endif
 
+#if defined(MBEDTLS_SSL_TICKET_C) && \
+    !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
+#error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites"
+#endif
+
 #if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) && \
     !defined(MBEDTLS_SSL_PROTO_SSL3) && !defined(MBEDTLS_SSL_PROTO_TLS1)
 #error "MBEDTLS_SSL_CBC_RECORD_SPLITTING defined, but not all prerequisites"
@@ -926,11 +931,6 @@
 #error "MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH defined, but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS) && \
-    !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
-#error "MBEDTLS_SSL_SESSION_TICKETS defined, but not all prerequisites"
-#endif
-
 #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) && !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
 #error "MBEDTLS_SSL_CONTEXT_SERIALIZATION defined, but not all prerequisites"
 #endif
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 73708bd..e0b442a 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1992,8 +1992,6 @@
  * tickets, including authenticated encryption and key management. Example
  * callbacks are provided by MBEDTLS_SSL_TICKET_C.
  *
- * Requires: MBEDTLS_GCM_C or MBEDTLS_CCM_C or MBEDTLS_CHACHAPOLY_C
- *
  * Comment this macro to disable support for SSL session tickets
  */
 #define MBEDTLS_SSL_SESSION_TICKETS
@@ -3404,7 +3402,8 @@
  * Module:  library/ssl_ticket.c
  * Caller:
  *
- * Requires: MBEDTLS_CIPHER_C
+ * Requires: MBEDTLS_CIPHER_C &&
+ *           ( MBEDTLS_GCM_C || MBEDTLS_CCM_C || MBEDTLS_CHACHAPOLY_C )
  */
 #define MBEDTLS_SSL_TICKET_C
 
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index dcb42e3..6d3dc8d 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1283,7 +1283,7 @@
     scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER
     # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
-    scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
+    scripts/config.py unset MBEDTLS_SSL_TICKET_C
     # Enable Key Wrapping mode for 128-bit block ciphers
     scripts/config.py set MBEDTLS_NIST_KW_C
 
@@ -1311,7 +1311,7 @@
     scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER
     # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
-    scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
+    scripts/config.py unset MBEDTLS_SSL_TICKET_C
     # Enable Key Wrapping mode for 128-bit block ciphers
     scripts/config.py set MBEDTLS_NIST_KW_C
 
@@ -1338,7 +1338,7 @@
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
     # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
-    scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
+    scripts/config.py unset MBEDTLS_SSL_TICKET_C
     # Enable Key Wrapping mode for 128-bit block ciphers
     scripts/config.py set MBEDTLS_NIST_KW_C
 
@@ -1367,7 +1367,7 @@
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
     # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
-    scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
+    scripts/config.py unset MBEDTLS_SSL_TICKET_C
     # Enable Key Wrapping mode for 128-bit block ciphers
     scripts/config.py set MBEDTLS_NIST_KW_C
 
@@ -1395,7 +1395,7 @@
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
     # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
-    scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
+    scripts/config.py unset MBEDTLS_SSL_TICKET_C
     # Enable Key Wrapping mode for 128-bit block ciphers
     scripts/config.py set MBEDTLS_NIST_KW_C
 
@@ -1424,7 +1424,7 @@
     scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
     # Modules that depend on AEAD
     scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
-    scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS
+    scripts/config.py unset MBEDTLS_SSL_TICKET_C
     # Enable Key Wrapping mode for 128-bit block ciphers
     scripts/config.py set MBEDTLS_NIST_KW_C