diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
similarity index 92%
rename from src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt
rename to src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
index 90671b19ca49de52e004fc1a8b3758ce37968cdd..e89c442918e678ed08a3f11752814a1ac66c8c75 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
@@ -20,7 +20,7 @@ import java.util.logging.Level.INFO
 import java.util.logging.LogManager
 import kotlin.io.path.absolute
 
-private class TestWithTemporaryAccount {
+internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.() -> Unit) {
 
     @OptIn(ExperimentalComposeUiApi::class)
     fun run() = application {
@@ -54,8 +54,7 @@ private class TestWithTemporaryAccount {
         lifecycleManager.startServices(dbKey)
         lifecycleManager.waitForStartup()
 
-        app.getDeterministicTestDataCreator().createTestData(5, 20, 50)
-        app.getTestDataCreator().createTestData(5, 20, 50, 4, 4, 10)
+        customization(app)
 
         // Creating test data happens on a background thread. As we do not get notified about updates to the conact
         // list yet, we need to wait a moment in order for that to finish (hopefully).
@@ -86,5 +85,3 @@ private class TestWithTemporaryAccount {
         return dataDir
     }
 }
-
-fun main(args: Array<String>) = TestWithTemporaryAccount().run()
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestDeterministicConversations.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestDeterministicConversations.kt
new file mode 100644
index 0000000000000000000000000000000000000000..146c23a59057162c2ac779474da835b62844c24c
--- /dev/null
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestDeterministicConversations.kt
@@ -0,0 +1,5 @@
+package org.briarproject.briar.desktop
+
+fun main(args: Array<String>) = RunWithTemporaryAccount {
+    getDeterministicTestDataCreator().createTestData(5, 20, 50)
+}.run()
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestMixedConversations.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestMixedConversations.kt
new file mode 100644
index 0000000000000000000000000000000000000000..085a2d01cfb8f6ccb64261a9bc05fe43064e9341
--- /dev/null
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestMixedConversations.kt
@@ -0,0 +1,6 @@
+package org.briarproject.briar.desktop
+
+fun main(args: Array<String>) = RunWithTemporaryAccount {
+    getDeterministicTestDataCreator().createTestData(5, 20, 50)
+    getTestDataCreator().createTestData(5, 20, 50, 4, 4, 10)
+}.run()
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestRandomConversations.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestRandomConversations.kt
new file mode 100644
index 0000000000000000000000000000000000000000..1daa1072fa39246efa11565f86f46f17533392fe
--- /dev/null
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestRandomConversations.kt
@@ -0,0 +1,5 @@
+package org.briarproject.briar.desktop
+
+fun main(args: Array<String>) = RunWithTemporaryAccount {
+    getTestDataCreator().createTestData(5, 20, 50, 4, 4, 10)
+}.run()