diff --git a/examples/client/client.c b/examples/client/client.c
index 12394ce68..8ff86769a 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -89,6 +89,11 @@ void client_test(void* args)
     SSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack);
 #endif
 
+#ifdef CYASSL_SNIFFER
+    /* don't use EDH, can't sniff tmp keys */
+    SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
+#endif
+
 #ifndef NO_FILESYSTEM
     if (SSL_CTX_load_verify_locations(ctx, caCert, 0) != SSL_SUCCESS)
         err_sys("can't load ca file");
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 66bd9fd46..9bcd75a27 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -63,6 +63,11 @@ void echoclient_test(void* args)
     load_buffer(ctx, caCert, CYASSL_CA);
 #endif
 
+#ifdef CYASSL_SNIFFER
+    /* don't use EDH, can't sniff tmp keys */
+    SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
+#endif
+
 #ifdef OPENSSL_EXTRA
     SSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack);
 #endif
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index 970253483..f7e753dad 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -127,7 +127,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
             CloseSocket(clientfd);
             continue;
         }
-#ifdef ECHO_OUT
+#if defined(PEER_INFO)
         showPeer(ssl);
 #endif
 
diff --git a/examples/server/server.c b/examples/server/server.c
index 6780a7c5a..8eeac8055 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -56,7 +56,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
 #if defined(CYASSL_DTLS)
     method  = DTLSv1_server_method();
 #elif  !defined(NO_TLS)
-    method = TLSv1_server_method();
+    method = SSLv23_server_method();
 #else
     method = SSLv3_server_method();
 #endif