diff --git a/tools/test-runner.c b/tools/test-runner.c
index 21897b6..eac120f 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -468,7 +468,7 @@ static const char *daemon_table[] = {
 static pid_t start_bluetooth_daemon(const char *home)
 {
 	const char *daemon = NULL;
-	char *argv[5], *envp[2];
+	char *argv[6], *envp[2];
 	pid_t pid;
 	struct stat st;
 	int i;
@@ -495,12 +495,13 @@ static pid_t start_bluetooth_daemon(const char *home)
 
 	argv[0] = (char *) daemon;
 	argv[1] = "--nodetach";
-	argv[2] = NULL;
+	argv[2] = "-d";
+	argv[3] = NULL;
 
 	if (!stat("src/main.conf", &st)) {
-		argv[2] = "-f";
-		argv[3] = "src/main.conf";
-		argv[4] = NULL;
+		argv[3] = "-f";
+		argv[4] = "src/main.conf";
+		argv[5] = NULL;
 	}
 
 	envp[0] = "DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket";