diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
index 389f3b531..dba82db37 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
@@ -41,6 +41,7 @@ constructor(
         }
         val dbKey = accountManager.databaseKey ?: throw AssertionError()
         lifecycleManager.startServices(dbKey)
+        lifecycleManager.waitForStartup()
     }
 
     override fun stop() {
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarTestServiceImpl.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarTestServiceImpl.kt
index 2d25b62e0..96ec8f1dd 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarTestServiceImpl.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarTestServiceImpl.kt
@@ -24,10 +24,11 @@ constructor(
         }
         accountManager.createAccount(user, pass)
         if (!accountManager.signIn(pass)) {
-            throw java.lang.AssertionError("Password invalid")
+            throw AssertionError("Password invalid")
         }
         val dbKey = accountManager.databaseKey ?: throw AssertionError()
         lifecycleManager.startServices(dbKey)
+        lifecycleManager.waitForStartup()
     }
 
     override fun stop() {