diff --git a/configure.ac b/configure.ac
index 9e12a21e8..6aa65ec7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5008,12 +5008,12 @@ AS_CASE([$FIPS_VERSION],
                  [AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"])])
 
         AS_IF([test "x$ENABLED_ED25519" != "xyes"],
-            [ENABLED_ED25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED25519"])
+            [ENABLED_ED25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED25519 -DHAVE_ED25519_KEY_IMPORT"])
         AS_IF([test "x$ENABLED_CURVE25519" != "xyes"],
             [ENABLED_CURVE25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE25519"])
 
         AS_IF([test "x$ENABLED_ED448" != "xyes"],
-            [ENABLED_ED448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED448"])
+            [ENABLED_ED448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED448 -DHAVE_ED448_KEY_IMPORT"])
         AS_IF([test "x$ENABLED_CURVE448" != "xyes"],
             [ENABLED_CURVE448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448"])
 
diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c
index e28f026f2..fe005f580 100644
--- a/wolfcrypt/src/ed25519.c
+++ b/wolfcrypt/src/ed25519.c
@@ -208,7 +208,7 @@ static int ed25519_hash(ed25519_key* key, const byte* in, word32 inLen,
 }
 
 #ifdef HAVE_ED25519_MAKE_KEY
-#if FIPS_VERSION_GE(7,0)
+#if FIPS_VERSION3_GE(6,0,0)
 /* Performs a Pairwise Consistency Test on an Ed25519 key pair.
  *
  * @param [in] key  Ed25519 key to test.
@@ -341,7 +341,7 @@ int wc_ed25519_make_key(WC_RNG* rng, int keySz, ed25519_key* key)
     /* put public key after private key, on the same buffer */
     XMEMMOVE(key->k + ED25519_KEY_SIZE, key->p, ED25519_PUB_KEY_SIZE);
 
-#if FIPS_VERSION_GE(7,0)
+#if FIPS_VERSION3_GE(6,0,0)
     ret = wc_ed25519_check_key(key);
     if (ret == 0) {
         ret = ed25519_pairwise_consistency_test(key, rng);
diff --git a/wolfcrypt/src/ed448.c b/wolfcrypt/src/ed448.c
index b274caa5d..de57ba039 100644
--- a/wolfcrypt/src/ed448.c
+++ b/wolfcrypt/src/ed448.c
@@ -187,7 +187,7 @@ static int ed448_hash(ed448_key* key, const byte* in, word32 inLen,
     return ret;
 }
 
-#if FIPS_VERSION_GE(7,0)
+#if FIPS_VERSION3_GE(6,0,0)
 /* Performs a Pairwise Consistency Test on an Ed448 key pair.
  *
  * @param [in] key  Ed448 key to test.
@@ -323,7 +323,7 @@ int wc_ed448_make_key(WC_RNG* rng, int keySz, ed448_key* key)
         /* put public key after private key, on the same buffer */
         XMEMMOVE(key->k + ED448_KEY_SIZE, key->p, ED448_PUB_KEY_SIZE);
 
-    #if FIPS_VERSION_GE(7,0)
+    #if FIPS_VERSION3_GE(6,0,0)
         ret = wc_ed448_check_key(key);
         if (ret == 0) {
             ret = ed448_pairwise_consistency_test(key, rng);