diff --git a/TESTS/psa/crypto_init/main.cpp b/TESTS/psa/crypto_init/main.cpp
index 482c05e624..b7fa4824e2 100644
--- a/TESTS/psa/crypto_init/main.cpp
+++ b/TESTS/psa/crypto_init/main.cpp
@@ -16,8 +16,8 @@
 * limitations under the License.
 */
 
-#if ((!defined(TARGET_PSA)) || (!defined(COMPONENT_PSA_SRV_IPC)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
-#error [NOT_SUPPORTED] Mbed SPM Crypto is OFF - skipping.
+#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
+#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
 #endif // TARGET_PSA
 
 #include "greentea-client/test_env.h"
@@ -49,6 +49,9 @@ utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
 
 static void check_multi_crypto_init_deinit()
 {
+#if !defined(COMPONENT_PSA_SRV_IPC)
+    TEST_SKIP();
+#endif
     uint8_t output[TEST_RANDOM_SIZE] = {0};
 
     psa_status_t status = psa_crypto_init();
@@ -98,6 +101,7 @@ Specification specification(greentea_test_setup, cases, greentea_test_teardown_h
 
 int main()
 {
+#if (defined(COMPONENT_PSA_SRV_IPC) || defined(MBEDTLS_ENTROPY_NV_SEED))
     uint8_t seed[MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE] = {0};
     /* inject some a seed for test*/
     for (int i = 0; i < MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE; ++i) {
@@ -106,5 +110,6 @@ int main()
 
     /* don't really care if this succeed this is just to make crypto init pass*/
     mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);
+#endif
     return !Harness::run(specification);
 }