diff --git a/src/tls.c b/src/tls.c
index 8f9baf753..eeae24463 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -5696,16 +5696,16 @@ static int TLSX_SupportedVersions_GetSize(void* data, byte msgType, word16* pSz)
     WOLFSSL* ssl = (WOLFSSL*)data;
     byte tls13Minor, tls12Minor, tls11Minor, isDtls;
 
-    /* unused on some configuration */
-    (void)tls12Minor;
-    (void)tls13Minor;
-    (void)tls11Minor;
-
     isDtls = !!ssl->options.dtls;
     tls13Minor = (byte)(isDtls ? DTLSv1_3_MINOR : TLSv1_3_MINOR);
     tls12Minor = (byte)(isDtls ? DTLSv1_2_MINOR : TLSv1_2_MINOR);
     tls11Minor = (byte)(isDtls ? DTLS_MINOR : TLSv1_1_MINOR);
 
+    /* unused on some configuration */
+    (void)tls12Minor;
+    (void)tls13Minor;
+    (void)tls11Minor;
+
     if (msgType == client_hello) {
         /* TLS v1.2 and TLS v1.3  */
         int cnt = 0;
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 7ce3bb8cc..c0abc7304 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -5312,12 +5312,11 @@ static WC_INLINE int process_handshake_messages(WOLFSSL* ssl, int blocking,
     int ret = 0;
     int dtls;
 
-    (void)dtls;
-
     if (zero_return == NULL || ssl == NULL)
         return -1;
 
     dtls = wolfSSL_dtls(ssl);
+    (void)dtls;
     *zero_return = 0;
 
     if (!blocking) {