diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras
index 3c3879c33f..e71e4a00c7 100644
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -1078,8 +1078,6 @@ XGETPASSWD
 XMSS_CALL_PRF_KEYGEN
 XPAR_VERSAL_CIPS_0_PSPMC_0_PSV_CORTEXA72_0_TIMESTAMP_CLK_FREQ
 XSECURE_CACHE_DISABLE
-fipsCastStatus_get
-wc_Des3_SetKey
 _ABI64
 _ABIO64
 _ARCH_PPC64
@@ -1262,8 +1260,10 @@ __xtensa__
 byte
 configTICK_RATE_HZ
 fallthrough
+fipsCastStatus_get
 noinline
 ssize_t
 sun
 versal
+wc_Des3_SetKey
 wc_Tls13_HKDF_Expand_Label
diff --git a/tests/api/test_aes.c b/tests/api/test_aes.c
index f7fe62b0c2..c463cea61d 100644
--- a/tests/api/test_aes.c
+++ b/tests/api/test_aes.c
@@ -9239,8 +9239,12 @@ int test_wc_AesGcmArgMcdc(void)
          * self-contained demonstration). */
         ExpectIntEQ(wc_AesGcmSetIV(&aes, 10, NULL, 0, &rng),
             WC_NO_ERR_TRACE(BAD_FUNC_ARG));
+#if defined(HAVE_FIPS) && FIPS_VERSION3_GE(7,0,0)
         ExpectIntEQ(wc_AesGcmSetIV(&aes, GCM_NONCE_MIN_SZ, NULL, 0, &rng),
-            0);
+            WC_FIPS_NOT_APPROVED);
+#else
+        ExpectIntEQ(wc_AesGcmSetIV(&aes, GCM_NONCE_MIN_SZ, NULL, 0, &rng), 0);
+#endif
         ExpectIntEQ(wc_AesGcmSetIV(&aes, GCM_NONCE_MID_SZ, NULL, 0, &rng),
             0);
         ExpectIntEQ(wc_AesGcmSetIV(&aes, GCM_NONCE_MAX_SZ, NULL, 0, &rng),