diff --git a/src/ssl.c b/src/ssl.c
index a3c09794d..abb700056 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -2931,6 +2931,9 @@ static int isValidCurveGroup(word16 name)
         case WOLFSSL_KYBER_90S_LEVEL1:
         case WOLFSSL_KYBER_90S_LEVEL3:
         case WOLFSSL_KYBER_90S_LEVEL5:
+        case WOLFSSL_P256_KYBER_LEVEL1:
+        case WOLFSSL_P384_KYBER_LEVEL3:
+        case WOLFSSL_P521_KYBER_LEVEL5:
         case WOLFSSL_P256_KYBER_90S_LEVEL1:
         case WOLFSSL_P384_KYBER_90S_LEVEL3:
         case WOLFSSL_P521_KYBER_90S_LEVEL5:
diff --git a/tests/api.c b/tests/api.c
index 4af5bcff2..f22b91fed 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -50957,9 +50957,7 @@ static int test_tls13_apis(void)
 #if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)
     int          groups[2] = { WOLFSSL_ECC_SECP256R1,
 #ifdef HAVE_PQC
-    #ifdef WOLFSSL_WC_KYBER
                                WOLFSSL_KYBER_LEVEL1
-    #endif
 #else
                                WOLFSSL_ECC_SECP256R1
 #endif
@@ -50981,9 +50979,7 @@ static int test_tls13_apis(void)
 #if (!defined(NO_ECC256)  || defined(HAVE_ALL_CURVES)) && ECC_MIN_KEY_SZ <= 256
             "P-256"
 #ifdef HAVE_PQC
-    #ifdef WOLFSSL_WC_KYBER
             ":P256_KYBER_LEVEL1"
-    #endif
 #endif
 #endif
 #ifdef HAVE_PQC