diff --git a/test/wh_test_check_struct_padding.c b/test/wh_test_check_struct_padding.c
index 01da5413..15566c20 100644
--- a/test/wh_test_check_struct_padding.c
+++ b/test/wh_test_check_struct_padding.c
@@ -39,6 +39,24 @@ whMessageNvm_ReadDma64Request      whMessageNvm_ReadDma64Request_test;
 whPacket whPacket_test;
 /* Test every variant of the nested union */
 wh_Packet_version_exchange           versionExchange;
+wh_Packet_key_cache_req              keyCacheReq;
+wh_Packet_key_evict_req              keyEvictReq;
+wh_Packet_key_commit_req             keyCommitReq;
+wh_Packet_key_export_req             keyExportReq;
+wh_Packet_key_erase_req              keyEraseReq;
+wh_Packet_counter_init_req           counterInitReq;
+wh_Packet_counter_increment_req      counterIncrementReq;
+wh_Packet_counter_read_req           counterReadReq;
+wh_Packet_counter_destroy_req        counterDestroyReq;
+wh_Packet_key_cache_res              keyCacheRes;
+wh_Packet_key_evict_res              keyEvictRes;
+wh_Packet_key_commit_res             keyCommitRes;
+wh_Packet_key_export_res             keyExportRes;
+wh_Packet_key_erase_res              keyEraseRes;
+wh_Packet_counter_init_res           counterInitRes;
+wh_Packet_counter_increment_res      counterIncrementRes;
+wh_Packet_counter_read_res           counterReadRes;
+#ifndef WOLFHSM_CFG_NO_CRYPTO
 wh_Packet_cipher_any_req             cipherAnyReq;
 wh_Packet_cipher_aescbc_req          cipherAesCbcReq;
 wh_Packet_cipher_aesgcm_req          cipherAesGcmReq;
@@ -57,15 +75,6 @@ wh_Packet_pk_curve25519_req          pkCurve25519Req;
 wh_Packet_pk_curve25519_res          pkCurve25519Res;
 wh_Packet_rng_req                    rngReq;
 wh_Packet_cmac_req                   cmacReq;
-wh_Packet_key_cache_req              keyCacheReq;
-wh_Packet_key_evict_req              keyEvictReq;
-wh_Packet_key_commit_req             keyCommitReq;
-wh_Packet_key_export_req             keyExportReq;
-wh_Packet_key_erase_req              keyEraseReq;
-wh_Packet_counter_init_req           counterInitReq;
-wh_Packet_counter_increment_req      counterIncrementReq;
-wh_Packet_counter_read_req           counterReadReq;
-wh_Packet_counter_destroy_req        counterDestroyReq;
 wh_Packet_cipher_aescbc_res          cipherAesCbcRes;
 wh_Packet_cipher_aesgcm_res          cipherAesGcmRes;
 wh_Packet_pk_rsakg_res               pkRsakgRes;
@@ -78,14 +87,10 @@ wh_Packet_pk_ecc_verify_res          pkEccVerifyRes;
 wh_Packet_pk_ecc_check_res           pkEccCheckRes;
 wh_Packet_rng_res                    rngRes;
 wh_Packet_cmac_res                   cmacRes;
-wh_Packet_key_cache_res              keyCacheRes;
-wh_Packet_key_evict_res              keyEvictRes;
-wh_Packet_key_commit_res             keyCommitRes;
-wh_Packet_key_export_res             keyExportRes;
-wh_Packet_key_erase_res              keyEraseRes;
-wh_Packet_counter_init_res           counterInitRes;
-wh_Packet_counter_increment_res      counterIncrementRes;
-wh_Packet_counter_read_res           counterReadRes;
+wh_Packet_hash_any_req               hashAnyReq;
+wh_Packet_hash_sha256_req            hashSha256Req;
+wh_Packet_hash_sha256_res            hashSha256Res;
+#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 #ifdef WOLFHSM_CFG_SHE_EXTENSION
 wh_Packet_she_set_uid_req            sheSetUidReq;
 wh_Packet_she_secure_boot_init_req   sheSecureBootInitReq;