diff --git a/api-tests/dev_apis/crypto/test_c016/test_data.h b/api-tests/dev_apis/crypto/test_c016/test_data.h
index 4ab7e63..23f1e2b 100644
--- a/api-tests/dev_apis/crypto/test_c016/test_data.h
+++ b/api-tests/dev_apis/crypto/test_c016/test_data.h
@@ -112,8 +112,10 @@
 	                   | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_MESSAGE,
     .alg             = PSA_ALG_RSA_PKCS1V15_SIGN_RAW,
     .bits            = 2048,
-    .expected_range  = {PSA_EXPORT_KEY_OUTPUT_SIZE(PSA_KEY_TYPE_RSA_KEY_PAIR, 2048), \
-	                    PSA_EXPORT_KEY_PAIR_MAX_SIZE},
+    .expected_range  = {1, BITS_TO_BYTES(MIN(PSA_EXPORT_KEY_OUTPUT_SIZE(\
+	                    PSA_KEY_TYPE_RSA_KEY_PAIR, 2048), \
+                        PSA_EXPORT_KEY_PAIR_MAX_SIZE))},
+
     .expected_status = PSA_SUCCESS
 },
 #endif
@@ -143,8 +145,9 @@
 	                   | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_MESSAGE,
     .alg             = PSA_ALG_RSA_PKCS1V15_SIGN_RAW,
     .bits            = 2048,
-    .expected_range  = {PSA_EXPORT_KEY_OUTPUT_SIZE(PSA_KEY_TYPE_RSA_PUBLIC_KEY, 2048),\
-	                    PSA_EXPORT_PUBLIC_KEY_MAX_SIZE},
+    .expected_range  = {1, BITS_TO_BYTES(MIN(PSA_EXPORT_KEY_OUTPUT_SIZE(\
+	                    PSA_KEY_TYPE_RSA_PUBLIC_KEY, 2048), \
+                        PSA_EXPORT_PUBLIC_KEY_MAX_SIZE))},
     .expected_status = PSA_ERROR_NOT_SUPPORTED
 },
 #endif
diff --git a/api-tests/val/nspe/val_crypto.h b/api-tests/val/nspe/val_crypto.h
index 86f41e8..a11369b 100644
--- a/api-tests/val/nspe/val_crypto.h
+++ b/api-tests/val/nspe/val_crypto.h
@@ -21,6 +21,7 @@
 #include "val.h"
 
 #define BYTES_TO_BITS(byte)             (byte * 8)
+#define BITS_TO_BYTES(bits)             (((bits) + 7) / 8)
 
 /* Size */
 #define AES_16B_KEY_SIZE                16