diff --git a/library/x509parse.c b/library/x509parse.c
index 55938f954..de4ed7f7d 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1331,7 +1331,7 @@ int x509parse_crt_der( x509_cert *chain, const unsigned char *buf, size_t buflen
  */
 int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
 {
-    int ret, success = 0, first_error = 0, total_failed = 0;
+    int success = 0, first_error = 0, total_failed = 0;
     int buf_format = X509_FORMAT_DER;
 
     /*
@@ -1355,6 +1355,7 @@ int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
 #if defined(POLARSSL_PEM_C)
     if( buf_format == X509_FORMAT_PEM )
     {
+        int ret;
         pem_context pem;
 
         while( buflen > 0 )
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index f4bde8d98..7e1c25d51 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -10,7 +10,7 @@
  * END_DEPENDENCIES
  */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:POLARSSL_PEM_C */
 void x509_csr_check( char *key_file, int md_type,
                           char *cert_req_check_file )
 {
@@ -59,7 +59,7 @@ void x509_csr_check( char *key_file, int md_type,
 }
 /* END_CASE */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:POLARSSL_PEM_C */
 void x509_crt_check( char *subject_key_file, char *subject_pwd,
                      char *subject_name, char *issuer_key_file,
                      char *issuer_pwd, char *issuer_name,