diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index 0b0120b..5ce1443 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -955,6 +955,23 @@
 #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 
+/**
+ * \brief               Query certificate for given extension type
+ *
+ * \param[in] ctx       Certificate context to be queried, must not be \c NULL
+ * \param ext_type      Extension type being queried for, must be a valid
+ *                      extension type. Must be one of the MBEDTLS_X509_EXT_XXX
+ *                      values
+ *
+ * \return              0 if the given extension type is not present,
+ *                      non-zero otherwise
+ */
+static inline int mbedtls_x509_crt_has_ext_type( const mbedtls_x509_crt *ctx,
+                                                 int ext_type )
+{
+    return ctx->MBEDTLS_PRIVATE(ext_types) & ext_type;
+}
+
 /** \} name Structures and functions for parsing and writing X.509 certificates */
 
 #if defined(MBEDTLS_X509_CRT_WRITE_C)
@@ -1138,23 +1155,6 @@
                                     unsigned char ns_cert_type );
 
 /**
- * \brief               Query certificate for given extension type
- *
- * \param[in] ctx       Certificate context to be queried, must not be \c NULL
- * \param ext_type      Extension type being queried for, must be a valid
- *                      extension type. Must be one of the MBEDTLS_X509_EXT_XXX
- *                      values
- *
- * \return              0 if the given extension type is not present,
- *                      non-zero otherwise
- */
-static inline int mbedtls_x509_crt_has_ext_type( const mbedtls_x509_crt *ctx,
-                                                 int ext_type )
-{
-    return ctx->MBEDTLS_PRIVATE(ext_types) & ext_type;
-}
-
-/**
  * \brief           Free the contents of a CRT write context
  *
  * \param ctx       CRT context to free
diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index dd74853..28bf733 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -2793,9 +2793,7 @@
 x509_verify_restart:"data_files/server10_int3-bs.pem":"data_files/test-int-ca2.crt":MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:MBEDTLS_X509_BADCERT_NOT_TRUSTED:500:25:100
 
 X509 ext types accessor: ext type present
-depends_on:MBEDTLS_X509_CRT_WRITE_C
 x509_accessor_ext_types:MBEDTLS_X509_EXT_KEY_USAGE:MBEDTLS_X509_EXT_KEY_USAGE
 
 X509 ext types accessor: ext type not present
-depends_on:MBEDTLS_X509_CRT_WRITE_C
 x509_accessor_ext_types:MBEDTLS_X509_EXT_KEY_USAGE:MBEDTLS_X509_EXT_SUBJECT_ALT_NAME
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 6ed5ea1..29057b7 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -400,7 +400,7 @@
  * END_DEPENDENCIES
  */
 
-/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_WRITE_C */
+/* BEGIN_CASE */
 void x509_accessor_ext_types( int ext_type, int has_ext_type )
 {
     mbedtls_x509_crt crt;