Index: build/test/test
==================================================================
--- build/test/test
+++ build/test/test
@@ -302,12 +302,16 @@
 			testscppre="$(dirname "${testscp}")/${testscp_tag}.sh"
 			scplogfile="${outputname}-${testscp_tag}.log"
 
 			# If a command is required to start the kit, prepare to kill it
 			# in case of timeout.
+			## Temporarily disabled since currently it is causing
+			## more problems in the form of tests being killed
+			## prematurely than we are having issues with tests
+			## hanging
 			kitrunkillpid=""
-			if [ -n "${kitruncmd}" ]; then
+			if [ "1" = "0" -a -n "${kitruncmd}" ]; then
 				(
 					sleep 120
 					killall "$(basename "${outputname}")" >/dev/null 2>/dev/null
 				) >/dev/null 2>/dev/null &
 				kitrunkillpid="$!"