diff --git a/test/main.sh b/test/main.sh
index 6baa64c260f0..294b48691cee 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -100,6 +100,7 @@ cleanup() {
     echo "==> Cleaning up"
 
     umount -l "${TEST_DIR}/dev"
+    kill_external_auth_daemon "$TEST_DIR"
     cleanup_lxds "$TEST_DIR"
   fi
 
@@ -144,6 +145,8 @@ spawn_lxd "${LXD_DIR}" true
 LXD_ADDR=$(cat "${LXD_DIR}/lxd.addr")
 export LXD_ADDR
 
+start_external_auth_daemon "${LXD_DIR}"
+
 LXD_SKIP_TESTS="${LXD_SKIP_TESTS:-}"
 export LXD_SKIP_TESTS