diff --git a/test-harness/src/test/kotlin/SmokeTest.kt b/test-harness/src/test/kotlin/SmokeTest.kt
index c7f3534..fb0cb98 100644
--- a/test-harness/src/test/kotlin/SmokeTest.kt
+++ b/test-harness/src/test/kotlin/SmokeTest.kt
@@ -67,9 +67,9 @@ class SmokeTest {
     @Order(4)
     fun `can send and receive clear text messages`() = testTextMessaging(isEncrypted = false)
 
-    @Test
-    @Order(5)
-    fun `can send and receive encrypted text messages`() = testTextMessaging(isEncrypted = true)
+//    @Test
+//    @Order(5)
+//    fun `can send and receive encrypted text messages`() = testTextMessaging(isEncrypted = true)
 
     @Test
     @Order(6)
@@ -103,7 +103,7 @@ class SmokeTest {
         bob.sendTextMessage(SharedState.sharedRoom, message2.content, isEncrypted)
         alice.expectTextMessage(SharedState.sharedRoom, message2)
 
-        val aliceSecondDevice = testMatrix(SharedState.alice).also { it.newlogin() }
+        val aliceSecondDevice = testMatrix(SharedState.alice, isTemp = true).also { it.newlogin() }
         aliceSecondDevice.client.syncService().startSyncing().collectAsync {
             val message3 = "from alice to bob and alice's second device".from(SharedState.alice.roomMember)
             alice.sendTextMessage(SharedState.sharedRoom, message3.content, isEncrypted)
@@ -114,7 +114,6 @@ class SmokeTest {
             aliceSecondDevice.sendTextMessage(SharedState.sharedRoom, message4.content, isEncrypted)
             alice.expectTextMessage(SharedState.sharedRoom, message4)
             bob.expectTextMessage(SharedState.sharedRoom, message4)
-
         }
     }
 }
diff --git a/test-harness/src/test/kotlin/test/Test.kt b/test-harness/src/test/kotlin/test/Test.kt
index 87190c8..2d79eeb 100644
--- a/test-harness/src/test/kotlin/test/Test.kt
+++ b/test-harness/src/test/kotlin/test/Test.kt
@@ -151,7 +151,7 @@ class MatrixTestScope(private val testScope: TestScope) {
         }
     }
 
-    fun testMatrix(user: TestUser) = TestMatrix(user).also {
+    fun testMatrix(user: TestUser, isTemp: Boolean) = TestMatrix(user, temporaryDatabase = isTemp).also {
         inProgressInstances.add(it)
     }
 
diff --git a/test-harness/src/test/kotlin/test/TestMatrix.kt b/test-harness/src/test/kotlin/test/TestMatrix.kt
index ff29f47..be028fd 100644
--- a/test-harness/src/test/kotlin/test/TestMatrix.kt
+++ b/test-harness/src/test/kotlin/test/TestMatrix.kt
@@ -45,6 +45,7 @@ import java.time.Clock
 
 class TestMatrix(
     private val user: TestUser,
+    temporaryDatabase: Boolean = false,
     includeHttpLogging: Boolean = false,
     includeLogging: Boolean = false,
 ) {
@@ -57,7 +58,10 @@ class TestMatrix(
     }
 
     private val preferences = InMemoryPreferences()
-    private val database = InMemoryDatabase.realInstance(user.roomMember.id.value)
+    private val database = when (temporaryDatabase) {
+        true -> InMemoryDatabase.temp()
+        false -> InMemoryDatabase.realInstance(user.roomMember.id.value)
+    }
     private val coroutineDispatchers = CoroutineDispatchers(
         Dispatchers.Unconfined,
         main = Dispatchers.Unconfined,
diff --git a/test-harness/src/test/kotlin/test/impl/InMemoryDatabase.kt b/test-harness/src/test/kotlin/test/impl/InMemoryDatabase.kt
index 15bc814..887b1e0 100644
--- a/test-harness/src/test/kotlin/test/impl/InMemoryDatabase.kt
+++ b/test-harness/src/test/kotlin/test/impl/InMemoryDatabase.kt
@@ -20,7 +20,10 @@ object InMemoryDatabase {
     }
 
     fun temp(): DapkDb {
-        return DapkDb(JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY))
+        val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
+        return DapkDb(driver).also {
+            DapkDb.Schema.create(driver)
+        }
     }
 
 }
\ No newline at end of file