diff --git a/examples/client/client.c b/examples/client/client.c
index de839b3e7..971306de6 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -3045,8 +3045,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 
     if (dtlsUDP == 0) {           /* don't send alert after "break" command */
         ret = wolfSSL_shutdown(ssl);
-        if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE)
-            wolfSSL_shutdown(ssl);    /* bidirectional shutdown */
+        while (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE) {
+            ret = wolfSSL_shutdown(ssl); /* bidirectional shutdown */
+            if (ret == WOLFSSL_SUCCESS)
+                printf("Bidirectional shutdown complete\n");
+        }
     }
 #if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
     if (atomicUser)
diff --git a/examples/server/server.c b/examples/server/server.c
index 7440d64df..140d21494 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -2378,9 +2378,13 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
 
         if (dtlsUDP == 0) {
             ret = SSL_shutdown(ssl);
-            if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE)
-                SSL_shutdown(ssl);    /* bidirectional shutdown */
+            while (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE) {
+                ret = SSL_shutdown(ssl); /* bidirectional shutdown */
+                if (ret == WOLFSSL_SUCCESS)
+                    printf("Bidirectional shutdown complete\n");
+            }
         }
+
         /* display collected statistics */
 #ifdef WOLFSSL_STATIC_MEMORY
         if (wolfSSL_is_static_memory(ssl, &ssl_stats) != 1)
diff --git a/tests/test.conf b/tests/test.conf
index 2e67d461f..736bdf935 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -2188,3 +2188,9 @@
 -v 3
 -l ECDHE-RSA-AES128-SHA256
 -U
+
+# server with bidirectional shutdown
+-w
+
+# client with bidirectional shutdown
+-w