diff --git a/examples/client/client.c b/examples/client/client.c
index 5d9f83a92..316fe643e 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -302,6 +302,10 @@ void client_test(void* args)
     usePsk = 1;
 #endif
 
+#if defined(NO_RSA) && !defined(HAVE_ECC)
+    usePsk = 1;
+#endif
+
     if (usePsk) {
 #ifndef NO_PSK
         CyaSSL_CTX_set_psk_client_callback(ctx, my_psk_client_cb);
@@ -310,7 +314,7 @@ void client_test(void* args)
             #ifdef HAVE_NULL_CIPHER
                 defaultCipherList = "PSK-NULL-SHA256";
             #else
-                defaultCipherList = "PSK-AES256-CBC-SHA256";
+                defaultCipherList = "PSK-AES128-CBC-SHA256";
             #endif
             if (CyaSSL_CTX_set_cipher_list(ctx,defaultCipherList) !=SSL_SUCCESS)
                 err_sys("client can't set cipher list 2");
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 7b482ce2c..5e9444958 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -46,7 +46,7 @@ void echoclient_test(void* args)
     SSL*        ssl    = 0;
 
     int doDTLS = 0;
-    int doLeanPSK = 0;
+    int doPSK = 0;
     int sendSz;
     int argc    = 0;
     char** argv = 0;
@@ -72,7 +72,11 @@ void echoclient_test(void* args)
 #endif
 
 #ifdef CYASSL_LEANPSK 
-    doLeanPSK = 1;
+    doPSK = 1;
+#endif
+
+#if defined(NO_RSA) && !defined(HAVE_ECC)
+    doPSK = 1;
 #endif
 
 #if defined(CYASSL_DTLS)
@@ -102,10 +106,18 @@ void echoclient_test(void* args)
     /* don't use EDH, can't sniff tmp keys */
     SSL_CTX_set_cipher_list(ctx, "AES256-SHA");
 #endif
-    if (doLeanPSK) {
-#ifdef CYASSL_LEANPSK
+    if (doPSK) {
+#ifndef NO_PSK
+        const char *defaultCipherList;
+
         CyaSSL_CTX_set_psk_client_callback(ctx, my_psk_client_cb);
-        SSL_CTX_set_cipher_list(ctx, "PSK-NULL-SHA");
+        #ifdef HAVE_NULL_CIPHER
+            defaultCipherList = "PSK-NULL-SHA256";
+        #else
+            defaultCipherList = "PSK-AES128-CBC-SHA256";
+        #endif
+        if (CyaSSL_CTX_set_cipher_list(ctx,defaultCipherList) !=SSL_SUCCESS)
+            err_sys("client can't set cipher list 2");
 #endif
     }
 
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index 364527607..c29bdfe97 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -60,7 +60,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
     CYASSL_CTX*    ctx    = 0;
 
     int    doDTLS = 0;
-    int    doLeanPSK = 0;
+    int    doPSK = 0;
     int    outCreated = 0;
     int    shutDown = 0;
     int    useAnyAddr = 0;
@@ -86,7 +86,11 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 #endif
 
 #ifdef CYASSL_LEANPSK
-    doLeanPSK = 1;
+    doPSK = 1;
+#endif
+
+#if defined(NO_RSA) && !defined(HAVE_ECC)
+    doPSK = 1;
 #endif
 
     tcp_listen(&sockfd, yasslPort, useAnyAddr, doDTLS);
@@ -106,6 +110,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 #endif
 
 #ifndef NO_FILESYSTEM
+    if (doPSK == 0) {
     #ifdef HAVE_NTRU
         /* ntru */
         if (CyaSSL_CTX_use_certificate_file(ctx, ntruCert, SSL_FILETYPE_PEM)
@@ -140,8 +145,9 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
             err_sys("can't load server key file, "
                     "Please run from CyaSSL home dir");
     #endif
+    } /* doPSK */
 #elif !defined(NO_CERTS)
-    if (!doLeanPSK) {
+    if (!doPSK) {
         load_buffer(ctx, svrCert, CYASSL_CERT);
         load_buffer(ctx, svrKey,  CYASSL_KEY);
     }
@@ -152,10 +158,19 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
     CyaSSL_CTX_set_cipher_list(ctx, "AES256-SHA");
 #endif
 
-    if (doLeanPSK) {
-#ifdef CYASSL_LEANPSK
+    if (doPSK) {
+#ifndef NO_PSK
+        const char *defaultCipherList;
+
         CyaSSL_CTX_set_psk_server_callback(ctx, my_psk_server_cb);
-        CyaSSL_CTX_set_cipher_list(ctx, "PSK-NULL-SHA");
+        CyaSSL_CTX_use_psk_identity_hint(ctx, "cyassl server");
+        #ifdef HAVE_NULL_CIPHER
+            defaultCipherList = "PSK-NULL-SHA256";
+        #else
+            defaultCipherList = "PSK-AES128-CBC-SHA256";
+        #endif
+        if (CyaSSL_CTX_set_cipher_list(ctx, defaultCipherList) != SSL_SUCCESS)
+            err_sys("server can't set cipher list 2");
 #endif
     }
 
diff --git a/examples/server/server.c b/examples/server/server.c
index e77adf8b5..02d6b2be4 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -270,6 +270,10 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
     usePsk = 1;
 #endif
 
+#if defined(NO_RSA) && !defined(HAVE_ECC)
+    usePsk = 1;
+#endif
+
 #ifndef NO_FILESYSTEM
     if (!usePsk) {
         if (SSL_CTX_use_certificate_file(ctx, ourCert, SSL_FILETYPE_PEM)
@@ -306,7 +310,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
             #ifdef HAVE_NULL_CIPHER
                 defaultCipherList = "PSK-NULL-SHA256";
             #else
-                defaultCipherList = "PSK-AES256-CBC-SHA256";
+                defaultCipherList = "PSK-AES128-CBC-SHA256";
             #endif
             if (SSL_CTX_set_cipher_list(ctx, defaultCipherList) != SSL_SUCCESS)
                 err_sys("server can't set cipher list 2");