diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt
index 8b936f047530c77102c45c9e7440292c603ddc0d..083c3c492728f72c4953522b432c5f8e8cfe8d62 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt
@@ -3,13 +3,14 @@ package org.briarproject.briar.desktop
 import org.briarproject.bramble.api.crypto.KeyStrengthener
 import org.briarproject.bramble.api.db.DatabaseConfig
 import java.io.File
+import java.nio.file.Path
 
-internal class DesktopDatabaseConfig(private val dbDir: File, private val keyDir: File) :
+internal class DesktopDatabaseConfig(private val dbDir: Path, private val keyDir: Path) :
     DatabaseConfig {
 
-    override fun getDatabaseDirectory() = dbDir
+    override fun getDatabaseDirectory(): File = dbDir.toFile()
 
-    override fun getDatabaseKeyDirectory() = keyDir
+    override fun getDatabaseKeyDirectory(): File = keyDir.toFile()
 
     override fun getKeyStrengthener(): KeyStrengthener? = null
 }
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
index 0672e990c85ce7b4b4e5f10e05f2eeb08efc4405..73c16fd05fde3c46a2437154378094891b83fc58 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
@@ -65,7 +65,7 @@ internal class DesktopModule(
     internal fun provideDatabaseConfig(): DatabaseConfig {
         val dbDir = appDir.resolve("db")
         val keyDir = appDir.resolve("key")
-        return DesktopDatabaseConfig(dbDir.toFile(), keyDir.toFile())
+        return DesktopDatabaseConfig(dbDir, keyDir)
     }
 
     @Provides
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
index 7a19894337e9e3056e64a52eafa7435f0bef0d65..562d13bba90aeb55d380e06e1cda0fa07afefd45 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
@@ -35,6 +35,7 @@ import org.briarproject.briar.desktop.ui.BriarUi
 import org.briarproject.briar.desktop.ui.BriarUiImpl
 import org.briarproject.briar.test.TestModule
 import java.io.File
+import java.nio.file.Path
 import java.util.Collections.emptyList
 import javax.inject.Singleton
 
@@ -55,7 +56,7 @@ import javax.inject.Singleton
     ]
 )
 internal class DesktopTestModule(
-    private val appDir: File,
+    private val appDir: Path,
     private val socksPort: Int = DEFAULT_SOCKS_PORT,
     private val controlPort: Int = DEFAULT_CONTROL_PORT
 ) {
@@ -67,8 +68,8 @@ internal class DesktopTestModule(
     @Provides
     @Singleton
     internal fun provideDatabaseConfig(): DatabaseConfig {
-        val dbDir = File(appDir, "db")
-        val keyDir = File(appDir, "key")
+        val dbDir = appDir.resolve("db")
+        val keyDir = appDir.resolve("key")
         return DesktopDatabaseConfig(dbDir, keyDir)
     }
 
@@ -81,7 +82,7 @@ internal class DesktopTestModule(
     @Provides
     @TorDirectory
     internal fun provideTorDirectory(): File {
-        return File(appDir, "tor")
+        return appDir.resolve("tor").toFile()
     }
 
     @Provides
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
index 16ec7364f8661e3a70fd8cb6dd313eb2eae86860..d58254b29fcafe89f27bf55792b9f4c35c4d9033 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
@@ -24,7 +24,7 @@ internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.()
 
         val app =
             DaggerBriarDesktopTestApp.builder().desktopTestModule(
-                DesktopTestModule(dataDir.toFile())
+                DesktopTestModule(dataDir)
             ).build()
 
         app.getShutdownManager().addShutdownHook {
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
index 2252d9e0860f2ecf2b2ccb0e5ac9eff16a58d8ab..dd5f338caebf6f8967f62fbbd9d61396ba05f778 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
@@ -40,7 +40,7 @@ internal class TestWithTwoTemporaryAccounts() {
 
         val app =
             DaggerBriarDesktopTestApp.builder().desktopTestModule(
-                DesktopTestModule(dataDir.toFile(), socksPort, controlPort)
+                DesktopTestModule(dataDir, socksPort, controlPort)
             ).build()
 
         apps.add(app)