diff --git a/library/pkparse.c b/library/pkparse.c
index 11afd0bdf..6f409689f 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1453,7 +1453,7 @@ int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
     if( ret == 0 )
     {
         p = pem.buf;
-        if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA )) == NULL )
+        if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL )
         {
             mbedtls_pem_free( &pem );
             return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index 456f41cef..d19847428 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -314,7 +314,7 @@ exit:
     if( session_serialized != NULL )
     {
         mbedtls_platform_zeroize( session_serialized, session_serialized_len );
-        mbedtls_free(session_serialized);
+        mbedtls_free( session_serialized );
         session_serialized = NULL;
     }
 
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 09b9d8e66..4224c413a 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -87,7 +87,7 @@ typedef struct handshake_test_options
     void (*cli_log_fun)(void *, int, const char *, int, const char *);
     int resize_buffers;
 #if defined(MBEDTLS_SSL_CACHE_C)
-    mbedtls_ssl_cache_context* cache;
+    mbedtls_ssl_cache_context *cache;
 #endif
 } handshake_test_options;
 
@@ -940,7 +940,7 @@ exit:
  * \retval  0 on success, otherwise error code.
  */
 int mbedtls_endpoint_init( mbedtls_endpoint *ep, int endpoint_type,
-                           handshake_test_options* options,
+                           handshake_test_options *options,
                            mbedtls_test_message_socket_context *dtls_context,
                            mbedtls_test_message_queue *input_queue,
                            mbedtls_test_message_queue *output_queue,
@@ -1983,7 +1983,7 @@ exit:
 #if defined(MBEDTLS_X509_CRT_PARSE_C) && \
     defined(MBEDTLS_ENTROPY_C) && \
     defined(MBEDTLS_CTR_DRBG_C)
-void perform_handshake( handshake_test_options* options )
+void perform_handshake( handshake_test_options *options )
 {
     /* forced_ciphersuite needs to last until the end of the handshake */
     int forced_ciphersuite[2];