diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 02802b8..343dd78 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -106,7 +106,7 @@
     mbedtls_cipher_init( &ctx );
     memset( input, 0, sizeof( input ) );
     memset( output, 0, sizeof( output ) );
-#if defined (MBEDTLS_CIPHER_MODE_CBC)
+#if defined(MBEDTLS_CIPHER_MODE_CBC)
     memset( iv, 0, sizeof( iv ) );
 
     /* Check and get info structures */
@@ -124,6 +124,7 @@
                  == MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
 
     mbedtls_cipher_free( &ctx );
+    mbedtls_cipher_init( &ctx );
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
     cipher_info = mbedtls_cipher_info_from_type( MBEDTLS_CIPHER_AES_128_ECB );
     TEST_ASSERT( NULL != cipher_info );