diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h
index 5cdd9141ff..940748edd9 100644
--- a/library/psa_crypto_core.h
+++ b/library/psa_crypto_core.h
@@ -859,6 +859,8 @@ typedef struct psa_crypto_input_copy_s {
     size_t len;
 } psa_crypto_input_copy_t;
 
+#define PSA_CRYPTO_INPUT_COPY_INIT { NULL, 0 }
+
 /** Allocate a local copy of an input buffer.
  *
  * \param[in] input             Pointer to input buffer.
@@ -887,6 +889,8 @@ typedef struct psa_crypto_output_copy_s {
     size_t len;
 } psa_crypto_output_copy_t;
 
+#define PSA_CRYPTO_OUTPUT_COPY_INIT { NULL, NULL, 0 }
+
 /** Allocate a local copy of an output buffer.
  *
  * \note                        This does not copy any data from the original
diff --git a/tests/suites/test_suite_psa_crypto_memory.function b/tests/suites/test_suite_psa_crypto_memory.function
index 7b6b7f189c..e9e529989e 100644
--- a/tests/suites/test_suite_psa_crypto_memory.function
+++ b/tests/suites/test_suite_psa_crypto_memory.function
@@ -184,12 +184,9 @@ void output_copy_free(int output_len, int original_is_null,
 {
     uint8_t *output = NULL;
     uint8_t *buffer_copy_for_comparison = NULL;
-    psa_crypto_output_copy_t output_copy;
+    psa_crypto_output_copy_t output_copy = PSA_CRYPTO_OUTPUT_COPY_INIT;
     psa_status_t status;
 
-    output_copy.buffer = NULL;
-    output_copy.len = 0;
-
     if (!original_is_null) {
         TEST_CALLOC(output, output_len);
     }