diff --git a/extras/build-tests/nix/run-tests b/extras/build-tests/nix/run-tests
index ac75dd640..546d34746 100755
--- a/extras/build-tests/nix/run-tests
+++ b/extras/build-tests/nix/run-tests
@@ -25,9 +25,8 @@ cd unrealircd-tests
 
 # FreeBSD has various issues with the tests from us and others,
 # better set a flag to keep it simple:
-FREEBSD=0
 if uname -a|grep -q FreeBSD; then
-	FREEBSD=1
+	NOSERVICES=1
 fi
 
 # Run the test framework, testing both services:
diff --git a/extras/tests/tls/tls-tests.bbwrapper b/extras/tests/tls/tls-tests.bbwrapper
new file mode 100755
index 000000000..21ee61127
--- /dev/null
+++ b/extras/tests/tls/tls-tests.bbwrapper
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# This is a simple wrapper script that will boot the ircd
+# and run the tests. When finished, either due to succes
+# or failure, it will kill the ircd
+#
+# Also, it makes sure the job times out (is killed)
+# in case it misbehaves
+#
+~/unrealircd/bin/unrealircd -f irc1.conf
+set +ex
+timeout --kill-after=5 300 extras/tests/tls/tls-tests
+EX="$?"
+killall -9 valgrind valgrind.bin memcheck memcheck-amd64-linux memcheck-x86-linux ircd unrealircd val 1>/dev/null 2>&1
+exit $EX