diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 21e36b5987..b5f7af5cf6 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -304,7 +304,7 @@ int mbedtls_x509write_crt_set_ext_key_usage( mbedtls_x509write_cert *ctx,
     int ret;
     size_t len = 0;
     const mbedtls_asn1_sequence *last_ext = NULL;
-    mbedtls_asn1_sequence *ext;
+    const mbedtls_asn1_sequence *ext;
 
     memset( buf, 0, sizeof(buf) );
 
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index 2e59658649..8e246ec411 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -357,7 +357,8 @@ void x509_crt_check( char *subject_key_file, char *subject_pwd,
         x.len = MBEDTLS_OID_SIZE(oid); \
         x.p   = (unsigned char*)oid;   \
         x.tag = MBEDTLS_ASN1_OID;      \
-    } while( 0 )
+    }                                  \
+    while( 0 )
 
             if( strcmp( ext_key_usage, "serverAuth" ) == 0 )
             {