diff --git a/configure.ac b/configure.ac
index d65263dd2..6f15b720e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5627,16 +5627,14 @@ AS_CASE([$FIPS_VERSION],
         AS_IF([test "x$ENABLED_ED25519" != "xyes" &&
                (test "$FIPS_VERSION" != "dev" || test "$enable_ed25519" != "no")],
             [ENABLED_ED25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED25519 -DHAVE_ED25519_KEY_IMPORT"])
-        AS_IF([test "$ENABLED_CURVE25519" = "no" &&
-               (test "$FIPS_VERSION" != "dev" || test "$enable_curve25519" != "no")],
-            [ENABLED_CURVE25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE25519"])
+        AS_IF([test "$ENABLED_CURVE25519" = "yes"],
+            [ENABLED_CURVE25519="no"; AM_CFLAGS="$AM_CFLAGS"])
 
         AS_IF([test "x$ENABLED_ED448" != "xyes" &&
                (test "$FIPS_VERSION" != "dev" || test "$enable_ed448" != "no")],
             [ENABLED_ED448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED448 -DHAVE_ED448_KEY_IMPORT"])
-        AS_IF([test "x$ENABLED_CURVE448" != "xyes" &&
-               (test "$FIPS_VERSION" != "dev" || test "$enable_curve448" != "no")],
-            [ENABLED_CURVE448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448"])
+        AS_IF([test "x$ENABLED_CURVE448" = "xyes"],
+            [ENABLED_CURVE448="no"; AM_CFLAGS="$AM_CFLAGS"])
 
         AS_IF([test "x$ENABLED_ED25519_STREAM" != "xyes" &&
                (test "$FIPS_VERSION" != "dev" || test "$enable_ed25519_stream" != "no")],
diff --git a/fips-check.sh b/fips-check.sh
index 41d04b053..882d169c6 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -260,8 +260,6 @@ v6.0.0)
     "wolfcrypt/src/aes.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-aes-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-curve25519_c.c:${ASM_PICKUPS_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-curve25519.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha256-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.c:${WOLF_REPO_TAG}"
@@ -269,8 +267,6 @@ v6.0.0)
     "wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha512-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-aes.c:${ASM_PICKUPS_TAG}"
-    "wolfcrypt/src/port/arm/armv8-curve25519_c.c:${ASM_PICKUPS_TAG}"
-    "wolfcrypt/src/port/arm/armv8-curve25519.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha256.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha3-asm.S:${ASM_PICKUPS_TAG}"
@@ -278,8 +274,6 @@ v6.0.0)
     "wolfcrypt/src/port/arm/armv8-sha512-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha512.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/cmac.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/curve25519.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/curve448.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/dh.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/ecc.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/ed25519.c:${WOLF_REPO_TAG}"
@@ -307,8 +301,6 @@ v6.0.0)
     "wolfcrypt/src/sp_x86_64.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/thumb2-aes-asm_c.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-aes-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/thumb2-curve25519_c.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/thumb2-curve25519.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-sha256-asm_c.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-sha256-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-sha3-asm_c.c:${WOLF_REPO_TAG}"
@@ -317,8 +309,6 @@ v6.0.0)
     "wolfcrypt/src/port/arm/thumb2-sha512-asm.S:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/aes.h:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/cmac.h:${WOLF_REPO_TAG}"
-    "wolfssl/wolfcrypt/curve25519.h:${WOLF_REPO_TAG}"
-    "wolfssl/wolfcrypt/curve448.h:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/dh.h:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/ecc.h:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/ed25519.h:${WOLF_REPO_TAG}"