diff --git a/ctdb/tests/src/cluster_mutex_test.c b/ctdb/tests/src/cluster_mutex_test.c
index 3c045f3e807..1252b688d94 100644
--- a/ctdb/tests/src/cluster_mutex_test.c
+++ b/ctdb/tests/src/cluster_mutex_test.c
@@ -29,6 +29,8 @@
 #include "lib/util/util.h"
 #include "lib/util/smb_strtox.h"
 
+#include "tests/src/test_backtrace.h"
+
 /*
  * ctdb_cluster_mutex.c is included below.  This requires a few hacks...
  */
@@ -663,6 +665,8 @@ int main(int argc, const char *argv[])
 	assert(ret == 0);
 	alarm(60);
 
+	test_backtrace_setup();
+
 	test = argv[1];
 	mutex_string = argv[2];
 
diff --git a/ctdb/tests/src/system_socket_test.c b/ctdb/tests/src/system_socket_test.c
index a6fe8547651..436f52a2df8 100644
--- a/ctdb/tests/src/system_socket_test.c
+++ b/ctdb/tests/src/system_socket_test.c
@@ -36,6 +36,8 @@
 
 #include "protocol/protocol_util.h"
 
+#include "tests/src/test_backtrace.h"
+
 static void hexdump(uint8_t *buf, size_t len)
 {
 	size_t i;
@@ -238,6 +240,8 @@ int main(int argc, char **argv)
 		usage(argv[0]);
 	}
 
+	test_backtrace_setup();
+
 	if (strcmp(argv[1], "types") == 0) {
 		test_types();
 	} else if (strcmp(argv[1], "arp") == 0) {
diff --git a/ctdb/wscript b/ctdb/wscript
index 8feda184d86..c3435c37eeb 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -945,7 +945,11 @@ def build(bld):
 
     bld.SAMBA_BINARY('system_socket_test',
                      source='tests/src/system_socket_test.c',
-                     deps='talloc ctdb-protocol-util pcap',
+                     deps='''ctdb-tests-common
+                             talloc
+                             ctdb-protocol-util
+                             pcap
+                          ''',
                      install_path='${CTDB_TEST_LIBEXECDIR}')
 
     bld.SAMBA_BINARY('porting_tests',
@@ -1072,7 +1076,11 @@ def build(bld):
 
     bld.SAMBA_BINARY('cluster_mutex_test',
                      source='tests/src/cluster_mutex_test.c',
-                     deps='samba-util talloc tevent',
+                     deps='''ctdb-tests-common
+                             samba-util
+                             talloc
+                             tevent
+                          ''',
                      install_path='${CTDB_TEST_LIBEXECDIR}')
 
     if bld.env.HAVE_INFINIBAND: