diff --git a/library/cipher.c b/library/cipher.c
index ebb03f464e..d0ba01ea01 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -1145,7 +1145,7 @@ int mbedtls_cipher_set_padding_mode(mbedtls_cipher_context_t *ctx,
 #if defined(MBEDTLS_CIPHER_PADDING_PKCS7)
         case MBEDTLS_PADDING_PKCS7:
             ctx->add_padding = add_pkcs_padding;
-            ctx->get_padding = get_pkcs_padding;
+            ctx->get_padding = mbedtls_get_pkcs_padding;
             break;
 #endif
 #if defined(MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS)
diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 2444ef9d8f..3eb46257df 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -1272,8 +1272,8 @@ void get_pkcs_padding(data_t *decrypted_block, int exp_ret, int exp_len)
     size_t calculated_len;
 
     TEST_CF_SECRET(decrypted_block->x, decrypted_block->len);
-    ret = get_pkcs_padding(decrypted_block->x, decrypted_block->len,
-                           &calculated_len);
+    ret = mbedtls_get_pkcs_padding(decrypted_block->x, decrypted_block->len,
+                                   &calculated_len);
     TEST_CF_PUBLIC(decrypted_block->x, decrypted_block->len);
 
     TEST_EQUAL(ret, exp_ret);