diff --git a/examples/client/client.c b/examples/client/client.c
index 502db65e2..30739516b 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -1860,9 +1860,10 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
         int done = 0;
 
         #ifdef NO_RSA
-            done += 1;
+            done += 1; /* require RSA for external tests */
         #endif
 
+        if (!XSTRNCMP(domain, "www.globalsign.com", 14)) {
         /* www.globalsign.com does not respond to ipv6 ocsp requests */
         #if defined(TEST_IPV6) && defined(HAVE_OCSP)
             done += 1;
@@ -1880,9 +1881,12 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
         #if defined(HAVE_OCSP) && !defined(HAVE_ECC)
             done += 1;
         #endif
+        }
 
         #ifndef NO_PSK
-            done += 1;
+        if (usePsk) {
+            done += 1; /* don't perform exernal tests if PSK is enabled */
+        }
         #endif
 
         #ifdef NO_SHA
@@ -1912,7 +1916,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 
         #if !defined(HAVE_AESGCM) && defined(NO_AES) && \
             !(defined(HAVE_CHACHA) && defined(HAVE_POLY1305))
-            /* need at least on of these for external tests */
+            /* need at least one of these for external tests */
             done += 1;
         #endif