diff --git a/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt b/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt
index 64d1b279a4..17286b007f 100644
--- a/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt
+++ b/ChangeLog.d/improve_x509_cert_writing_serial_number_management.txt
@@ -7,4 +7,4 @@ Bugfix
 New deprecations
    * mbedtls_x509write_crt_set_serial() is now being deprecated in favor of
      mbedtls_x509write_crt_set_serial_new(). The goal here is to remove any
-     direct dependency of X509 from BIGNUM_C.
+     direct dependency of X509 on BIGNUM_C.
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 55f22d76b9..0fd307c480 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -119,7 +119,7 @@ int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx,
                         MBEDTLS_X509_RFC5280_MAX_SERIAL_LEN );
     if( ret < 0 )
         return ret;
-    
+
     /* Copy data to the internal structure skipping leading zeros */
     memcpy(ctx->serial, &tmp[MBEDTLS_X509_RFC5280_MAX_SERIAL_LEN - tmp_len],
             tmp_len);
diff --git a/tests/suites/test_suite_x509write.data b/tests/suites/test_suite_x509write.data
index 6cfbf24471..a986436cd2 100644
--- a/tests/suites/test_suite_x509write.data
+++ b/tests/suites/test_suite_x509write.data
@@ -169,4 +169,4 @@ X509 String to Names #6 (Escape at end)
 mbedtls_x509_string_to_names:"C=NL, O=Offspark\":"":MBEDTLS_ERR_X509_INVALID_NAME
 
 Check max serial length
-x509_set_serial_check:
\ No newline at end of file
+x509_set_serial_check:
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index d683a5ee1c..621c012c49 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -581,13 +581,13 @@ void x509_set_serial_check()
 
     memset( invalid_serial, 0x01, sizeof( invalid_serial ) );
 
-#if defined(MBEDTLS_BIGNUM_C) && !defined(MBEDTLS_DEPRECATED_REMOVED)
+#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
     mbedtls_mpi serial_mpi;
 
     mbedtls_mpi_init(&serial_mpi);
     TEST_EQUAL( mbedtls_mpi_read_binary( &serial_mpi, invalid_serial,
                                     sizeof( invalid_serial ) ), 0 );
-    TEST_EQUAL( mbedtls_x509write_crt_set_serial( &ctx, &serial_mpi ), 
+    TEST_EQUAL( mbedtls_x509write_crt_set_serial( &ctx, &serial_mpi ),
                         MBEDTLS_ERR_X509_BAD_INPUT_DATA );
     mbedtls_mpi_free(&serial_mpi);
 #endif