diff --git a/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt b/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt
index 3e2a92530..dff246709 100644
--- a/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt
+++ b/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt
@@ -17,6 +17,8 @@ require_lws_config(LWS_WITH_TLS 1 requirements)
 if (requirements)
 	add_executable(${SAMP} ${SRCS})
 	
+	find_program(VALGRIND "valgrind")
+	
        #
        # instantiate the server per sai builder instance, they are running in the same
        # machine context in parallel so they can tread on each other otherwise
@@ -49,23 +51,43 @@ if (WIN32)
 	add_test(NAME st_hcmp_srv COMMAND cmd.exe /c start /b $<TARGET_FILE:test-server> -s --port 1${PORT_HCM_SRV})
 	add_test(NAME ki_hcmp_srv COMMAND taskkill /F /IM $<TARGET_FILE_NAME:test-server> /T)
 else()
-	add_test(NAME st_hcm_srv COMMAND
-		${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh
-			hcm_srv $<TARGET_FILE:lws-minimal-http-server-tls>
-			--port ${PORT_HCM_SRV} --ignore-sigterm)
-	add_test(NAME ki_hcm_srv COMMAND
-		${CMAKE_SOURCE_DIR}/scripts/ctest-background-kill.sh
-			hcm_srv $<TARGET_FILE_NAME:lws-minimal-http-server-tls>
-				--port ${PORT_HCM_SRV})
-	add_test(NAME st_hcmp_srv COMMAND
+	if (VALGRIND)
+		add_test(NAME st_hcm_srv COMMAND
 			${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh
-				hcmp_srv $<TARGET_FILE:test-server> -s
-				-r ${CMAKE_SOURCE_DIR}/destdir/usr/local/share/libwebsockets-test-server/
-				--port 1${PORT_HCM_SRV} --ignore-sigterm)
-	add_test(NAME ki_hcmp_srv COMMAND
+				hcm_srv ${VALGRIND} --tool=memcheck $<TARGET_FILE:lws-minimal-http-server-tls>
+				--port ${PORT_HCM_SRV})
+		add_test(NAME ki_hcm_srv COMMAND
 			${CMAKE_SOURCE_DIR}/scripts/ctest-background-kill.sh
-				hcmp_srv $<TARGET_FILE_NAME:test-server>
-				--port 1${PORT_HCM_SRV})
+				hcm_srv ${VALGRIND} $<TARGET_FILE_NAME:lws-minimal-http-server-tls>
+					--port ${PORT_HCM_SRV})
+		add_test(NAME st_hcmp_srv COMMAND
+				${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh
+					hcmp_srv ${VALGRIND} --tool=memcheck $<TARGET_FILE:test-server> -s
+					-r ${CMAKE_SOURCE_DIR}/destdir/usr/local/share/libwebsockets-test-server/
+					--port 1${PORT_HCM_SRV})
+		add_test(NAME ki_hcmp_srv COMMAND
+				${CMAKE_SOURCE_DIR}/scripts/ctest-background-kill.sh
+					hcmp_srv ${VALGRIND} $<TARGET_FILE_NAME:test-server>
+					--port 1${PORT_HCM_SRV})
+	else()
+		add_test(NAME st_hcm_srv COMMAND
+			${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh
+				hcm_srv $<TARGET_FILE:lws-minimal-http-server-tls>
+				--port ${PORT_HCM_SRV} --ignore-sigterm)
+		add_test(NAME ki_hcm_srv COMMAND
+			${CMAKE_SOURCE_DIR}/scripts/ctest-background-kill.sh
+				hcm_srv $<TARGET_FILE_NAME:lws-minimal-http-server-tls>
+					--port ${PORT_HCM_SRV})
+		add_test(NAME st_hcmp_srv COMMAND
+				${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh
+					hcmp_srv $<TARGET_FILE:test-server> -s
+					-r ${CMAKE_SOURCE_DIR}/destdir/usr/local/share/libwebsockets-test-server/
+					--port 1${PORT_HCM_SRV} --ignore-sigterm)
+		add_test(NAME ki_hcmp_srv COMMAND
+				${CMAKE_SOURCE_DIR}/scripts/ctest-background-kill.sh
+					hcmp_srv $<TARGET_FILE_NAME:test-server>
+					--port 1${PORT_HCM_SRV})
+	endif()
 endif()
 
 	set_tests_properties(st_hcm_srv PROPERTIES
@@ -131,7 +153,7 @@ endif()
 			     PROPERTIES
 			     FIXTURES_REQUIRED "hcm_srv"
 			     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples/http-client/minimal-http-client-multi
-			     TIMEOUT 20)
+			     TIMEOUT 50)
 
 	# POSTs against local http-server-form-post
 	add_test(NAME http-client-multi-post COMMAND lws-minimal-http-client-multi