diff --git a/configure.ac b/configure.ac
index 212a3874e..111ed9a7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -743,7 +743,6 @@ then
     if test "$ENABLED_LINUXKM_DEFAULTS" != "yes"
     then
         test "$enable_compkey" = "" && enable_compkey=yes
-        test "$enable_quic" = "" && enable_quic=yes
         AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT"
     fi
 
@@ -2927,6 +2926,10 @@ AC_ARG_ENABLE([curve25519],
     [ ENABLED_CURVE25519=no ]
     )
 
+if test "$ENABLED_QUIC" = "yes" && test "$ENABLED_CURVE25519" = "no"
+then
+    ENABLED_CURVE25519=yes
+fi
 
 if test "$ENABLED_OPENSSH" = "yes" && test "x$ENABLED_FIPS" = "xno"
 then
@@ -5709,12 +5712,6 @@ then
     # FTPS server requires pointer to session cache
     AM_CFLAGS="$AM_CFLAGS -DNO_SESSION_CACHE_REF"
 
-    if test "x$ENABLED_QUIC" = "xno"
-    then
-        ENABLED_QUIC="yes"
-        AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_QUIC"
-    fi
-
     AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB"
 fi
 
diff --git a/tests/unit.c b/tests/unit.c
index 43cebc0a9..ab2896097 100644
--- a/tests/unit.c
+++ b/tests/unit.c
@@ -174,6 +174,15 @@ int unit_test(int argc, char** argv)
 
     }
 
+#ifdef WOLFSSL_QUIC
+    if ( (ret = QuicTest()) != 0){
+        printf("quic test failed with %d\n", ret);
+        goto exit;
+    }
+#endif
+
+    SrpTest();
+
 #ifndef NO_WOLFSSL_CIPHER_SUITE_TEST
 #if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER)
 #ifndef SINGLE_THREADED
@@ -185,15 +194,6 @@ int unit_test(int argc, char** argv)
 #endif
 #endif /* NO_WOLFSSL_CIPHER_SUITE_TEST */
 
-#ifdef WOLFSSL_QUIC
-    if ( (ret = QuicTest()) != 0){
-        printf("quic test failed with %d\n", ret);
-        goto exit;
-    }
-#endif
-
-    SrpTest();
-
 exit:
 #ifdef HAVE_WNR
     if (wc_FreeNetRandom() < 0)