diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index e27ecc2b5..a71fc48b2 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -150,8 +150,11 @@ void echoclient_test(void* args)
 #endif
 
 #if defined(CYASSL_SNIFFER)
-    /* don't use EDH, can't sniff tmp keys */
-    SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
+    /* Only set if not running testsuite */
+    if (XSTRNCMP(argv[0], "testsuite", XSTRLEN("testsuite")) != 0) {
+        /* don't use EDH, can't sniff tmp keys */
+        SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
+    }
 #endif
 #ifndef NO_PSK
     if (doPSK) {
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index d268ab479..847667a27 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -227,8 +227,11 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 #endif
 
 #if defined(CYASSL_SNIFFER)
-    /* don't use EDH, can't sniff tmp keys */
-    CyaSSL_CTX_set_cipher_list(ctx, "AES256-SHA");
+    /* Only set if not running testsuite */
+    if (XSTRNCMP(argv[0], "testsuite", XSTRLEN("testsuite")) != 0) {
+        /* don't use EDH, can't sniff tmp keys */
+        CyaSSL_CTX_set_cipher_list(ctx, "AES256-SHA");
+    }
 #endif
 
     if (doPSK) {
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 8cd2cd291..7a8115a43 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -152,7 +152,7 @@ int testsuite_test(int argc, char** argv)
             return EXIT_FAILURE;
         }
 
-        strcpy(arg[0], "echoclient");
+        strcpy(arg[0], "testsuite");
         strcpy(arg[1], "input");
         strcpy(arg[2], outputName);