diff --git a/SCRIPTS-LIST b/SCRIPTS-LIST
index 0638c5555..2f2306590 100644
--- a/SCRIPTS-LIST
+++ b/SCRIPTS-LIST
@@ -6,7 +6,6 @@ pre-commit.sh - our pre commit hook, saves current state before running commit
 commit-tests.sh - our commit tests, must pass before a commit is accepted, use
                   -n (--no-verify) to disable
 
-client-test.sh - example client test against google
 
 fips-check.sh - checks if current wolfSSL version works against FIPS wolfCrypt
                 comment out last line to leave working directory
@@ -23,6 +22,7 @@ certs/
 
 scripts/
  external.test - example client test against our website, part of tests
+ google.test   - example client test against google, part of tests
  resume.test   - example sessoin resume test, part of tests
  sniffer-testsuite.test -  runs snifftest on a pcap of testsuite, part of tests
                            in sniffer mode
diff --git a/client-test.sh b/scripts/google.test
similarity index 57%
rename from client-test.sh
rename to scripts/google.test
index 7ff918135..789c06989 100755
--- a/client-test.sh
+++ b/scripts/google.test
@@ -1,16 +1,18 @@
 #!/bin/bash
 
-# client-test.sh
+# google.test
+
+server=www.google.com
 
 [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
 
 # is our desired server there?
-ping -c 2 -i 0.2 www.google.com
+ping -c 2 -i 0.2 $server
 RESULT=$?
-[ $RESULT -ne 0 ] && echo -e "\n\nCouldn't find server, skipping" && exit 0
+[ $RESULT -ne 0 ] && echo -e "\n\nCouldn't find $server, skipping" && exit 0
 
 # client test against the server
-./examples/client/client -h www.google.com -p 443 -g -d
+./examples/client/client -X -C -h $server -p 443 -g -d
 RESULT=$?
 [ $RESULT -ne 0 ] && echo -e "\n\nClient connection failed" && exit 1
 
diff --git a/scripts/include.am b/scripts/include.am
index 0591e2813..924634aa7 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -12,6 +12,7 @@ if BUILD_EXAMPLES
 dist_noinst_SCRIPTS+= scripts/resume.test
 if !BUILD_IPV6
 dist_noinst_SCRIPTS+= scripts/external.test
+dist_noinst_SCRIPTS+= scripts/google.test
 endif
 endif