diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h
index 779868134..7475aa87f 100644
--- a/IDE/WIN/user_settings.h
+++ b/IDE/WIN/user_settings.h
@@ -7,6 +7,7 @@
 #endif
 
 #define USE_WOLFSSL_IO
+#define HAVE_AESGCM
 #define WOLFSSL_TLS13
 #define HAVE_HKDF
 #define HAVE_FFDHE_4096
@@ -21,7 +22,6 @@
     #define OPENSSL_EXTRA
     #define HAVE_THREAD_LS
     #define WOLFSSL_KEY_GEN
-    #define HAVE_AESGCM
     #define HAVE_HASHDRBG
     #define WOLFSSL_SHA384
     #define WOLFSSL_SHA512
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 32bae5768..35a4219d5 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -180,7 +180,7 @@ void echoclient_test(void* args)
 
 #if defined(CYASSL_SNIFFER)
     /* Only set if not running testsuite */
-    if (XSTRSTR(argv[0], "testsuite") != 0) {
+    if (XSTRSTR(argv[0], "testsuite") == NULL) {
         /* don't use EDH, can't sniff tmp keys */
         SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
     }
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index 597e5a5d1..7b8adb822 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -245,7 +245,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 
 #if defined(CYASSL_SNIFFER)
     /* Only set if not running testsuite */
-    if (XSTRSTR(argv[0], "testsuite") != 0) {
+    if (XSTRSTR(argv[0], "testsuite") == NULL) {
         /* don't use EDH, can't sniff tmp keys */
         CyaSSL_CTX_set_cipher_list(ctx, "AES256-SHA");
     }
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index d83854d85..ee6190831 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -449,7 +449,9 @@ void wait_tcp_ready(func_args* args)
      * args->signal->ready = 0; */
 
     (void)tx_mutex_put(&args->signal->mutex);
-
+#elif defined(USE_WINDOWS_API)
+    /* Give peer a moment to get running */
+    _sleep(500);
 #else
     (void)args;
 #endif