diff --git a/configure.ac b/configure.ac
index ba5d74147..1bf5b8eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2242,7 +2242,9 @@ AC_ARG_ENABLE([examples],
 AS_IF([test "x$ENABLED_FILESYSTEM" = "xno"], [ENABLED_EXAMPLES="no"])
 AS_IF([test "x$ENABLED_INLINE" = "xno"], [ENABLED_EXAMPLES="no"])
 AS_IF([test "x$ENABLED_CRYPTONLY" = "xyes"], [ENABLED_EXAMPLES="no"])
-AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"])
+AM_CONDITIONAL([BUILD_EXAMPLE_SERVERS], [test "x$ENABLED_EXAMPLES" = "xyes" && test "x$ENABLED_LEANTLS" = "xno"])
+AM_CONDITIONAL([BUILD_EXAMPLE_CLIENTS], [test "x$ENABLED_EXAMPLES" = "xyes"])
+AM_CONDITIONAL([BUILD_TESTS], [test "x$ENABLED_EXAMPLES" = "xyes" && test "x$ENABLED_LEANTLS" = "xno"])
 
 # Enable wolfCrypt test and benchmark
 AC_ARG_ENABLE([crypttests],
diff --git a/examples/client/include.am b/examples/client/include.am
index 862cdfa08..876f6a28e 100644
--- a/examples/client/include.am
+++ b/examples/client/include.am
@@ -1,7 +1,7 @@
 # vim:ft=automake
 # All paths should be given relative to the root
 
-if BUILD_EXAMPLES
+if BUILD_EXAMPLE_CLIENTS
 noinst_PROGRAMS += examples/client/client
 noinst_HEADERS += examples/client/client.h
 examples_client_client_SOURCES      = examples/client/client.c
diff --git a/examples/echoclient/include.am b/examples/echoclient/include.am
index f0d5868c2..7f0bc47d1 100644
--- a/examples/echoclient/include.am
+++ b/examples/echoclient/include.am
@@ -3,7 +3,7 @@
 # All paths should be given relative to the root
 
 
-if BUILD_EXAMPLES
+if BUILD_EXAMPLE_CLIENTS
 noinst_PROGRAMS += examples/echoclient/echoclient
 noinst_HEADERS += examples/echoclient/echoclient.h
 examples_echoclient_echoclient_SOURCES      = examples/echoclient/echoclient.c
diff --git a/examples/echoserver/include.am b/examples/echoserver/include.am
index 767da6c46..516c40441 100644
--- a/examples/echoserver/include.am
+++ b/examples/echoserver/include.am
@@ -3,7 +3,7 @@
 # All paths should be given relative to the root
 
 
-if BUILD_EXAMPLES
+if BUILD_EXAMPLE_SERVERS
 noinst_PROGRAMS += examples/echoserver/echoserver
 noinst_HEADERS += examples/echoserver/echoserver.h
 examples_echoserver_echoserver_SOURCES      = examples/echoserver/echoserver.c
diff --git a/examples/server/include.am b/examples/server/include.am
index f42490591..8a3d75119 100644
--- a/examples/server/include.am
+++ b/examples/server/include.am
@@ -3,7 +3,7 @@
 # All paths should be given relative to the root
 
 
-if BUILD_EXAMPLES
+if BUILD_EXAMPLE_SERVERS
 noinst_PROGRAMS += examples/server/server
 noinst_HEADERS += examples/server/server.h
 examples_server_server_SOURCES      = examples/server/server.c
diff --git a/scripts/include.am b/scripts/include.am
index 5866a554e..19e05feaf 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -8,7 +8,7 @@ if BUILD_SNIFFTEST
 dist_noinst_SCRIPTS+= scripts/sniffer-testsuite.test
 endif
 
-if BUILD_EXAMPLES
+if BUILD_EXAMPLE_SERVERS
 
 dist_noinst_SCRIPTS+= scripts/resume.test
 EXTRA_DIST+= scripts/benchmark.test
@@ -19,12 +19,6 @@ dist_noinst_SCRIPTS+= scripts/crl-revoked.test
 scripts/crl-revoked.log: scripts/resume.log
 endif
 
-if !BUILD_IPV6
-dist_noinst_SCRIPTS+= scripts/external.test
-dist_noinst_SCRIPTS+= scripts/google.test
-#dist_noinst_SCRIPTS+= scripts/openssl.test
-endif
-
 if BUILD_OCSP
 dist_noinst_SCRIPTS+= scripts/ocsp.test
 endif
@@ -47,6 +41,14 @@ endif
 
 endif
 
+if BUILD_EXAMPLE_CLIENTS
+if !BUILD_IPV6
+dist_noinst_SCRIPTS+= scripts/external.test
+dist_noinst_SCRIPTS+= scripts/google.test
+#dist_noinst_SCRIPTS+= scripts/openssl.test
+endif
+endif
+
 if BUILD_PSK
 dist_noinst_SCRIPTS+= scripts/psk.test
 endif
diff --git a/tests/include.am b/tests/include.am
index e0a82a405..63768e663 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -3,7 +3,7 @@
 # All paths should be given relative to the root
 
 
-if BUILD_EXAMPLES
+if BUILD_TESTS
 check_PROGRAMS += tests/unit.test
 noinst_PROGRAMS += tests/unit.test
 tests_unit_test_SOURCES = \
diff --git a/testsuite/include.am b/testsuite/include.am
index 86b6f9784..ed2604427 100644
--- a/testsuite/include.am
+++ b/testsuite/include.am
@@ -3,7 +3,7 @@
 # All paths should be given relative to the root
 
 
-if BUILD_EXAMPLES
+if BUILD_TESTS
 check_PROGRAMS += testsuite/testsuite.test
 noinst_PROGRAMS += testsuite/testsuite.test
 testsuite_testsuite_test_SOURCES = \