diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index 089484f19..b1c1abb06 100644
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -1064,7 +1064,6 @@ psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,
 
 psa_status_t psa_cipher_finish(psa_cipher_operation_t *operation,
                                uint8_t *output,
-                               size_t output_size,
                                size_t *output_length);
 
 psa_status_t psa_cipher_abort(psa_cipher_operation_t *operation);
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 96eea5b9f..0d309c00b 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1471,7 +1471,6 @@ psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,
 
 psa_status_t psa_cipher_finish(psa_cipher_operation_t *operation,
                                uint8_t *output,
-                               size_t output_size,
                                size_t *output_length)
 {
     int ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 5b4702bef..e3294a79b 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -571,7 +571,6 @@ void cipher_test_positive( int alg_arg, int key_type_arg,
                                     output, output_size, 
                                     &output_length) == PSA_SUCCESS );
 	TEST_ASSERT( psa_cipher_finish( &operation, output + output_length,
-                                    output_size,
                                     &output_length) == PSA_SUCCESS );
 
     TEST_ASSERT( psa_cipher_abort( &operation ) == PSA_SUCCESS );
@@ -631,7 +630,6 @@ void cipher_test_verify_output( int alg_arg, int key_type_arg,
                                     output1, output1_size, 
                                     &output1_length) == PSA_SUCCESS );
 	TEST_ASSERT( psa_cipher_finish( &operation1, output1 + output1_length,
-                                    output1_size - output1_length,
                                     &tmp_output_length) == PSA_SUCCESS );
 									
     output1_length += tmp_output_length;
@@ -647,7 +645,6 @@ void cipher_test_verify_output( int alg_arg, int key_type_arg,
                                     output2, output2_size, &output2_length) == PSA_SUCCESS );
     tmp_output_length = 0;
 	TEST_ASSERT( psa_cipher_finish( &operation2, output2 + output2_length,
-                                    output2_size - output2_length,
                                     &tmp_output_length) == PSA_SUCCESS );  
     
 	output2_length += tmp_output_length;