diff --git a/ChatSecureTests/FileTransferIntegrationTests.swift b/ChatSecureTests/FileTransferIntegrationTests.swift
index f995e66e..a29c5572 100644
--- a/ChatSecureTests/FileTransferIntegrationTests.swift
+++ b/ChatSecureTests/FileTransferIntegrationTests.swift
@@ -20,7 +20,7 @@ class FileTransferIntegrationTests: XCTestCase {
     
     override func setUp() {
         super.setUp()
-        DDLog.add(DDTTYLogger.sharedInstance)
+        DDTTYLogger.sharedInstance.flatMap { DDLog.add($0) }
         if let databaseDirectory = databaseManager?.databaseDirectory {
             FileManager.default.clearDirectory(databaseDirectory)
         }
diff --git a/ChatSecureTests/OTROMEMOIntegrationTest.swift b/ChatSecureTests/OTROMEMOIntegrationTest.swift
index 146d85e1..a0253ddc 100644
--- a/ChatSecureTests/OTROMEMOIntegrationTest.swift
+++ b/ChatSecureTests/OTROMEMOIntegrationTest.swift
@@ -137,19 +137,14 @@ class OTROMEMOIntegrationTest: XCTestCase {
         
         var messageFound = false
         self.aliceUser?.databaseManager.writeConnection?.read({ (transaction) in
-            transaction.enumerateKeysAndObjects(inCollection: OTRBaseMessage.collection, using: { (key, object, stop) in
-                if let message = object as? OTRBaseMessage {
-                    XCTAssertEqual(message.text, messageText)
-                    messageFound = true
-                }
-                
-            })
-            
-            transaction.enumerateKeysAndObjects(inCollection: OMEMODevice.collection, using: { (key, object, stop) in
-                let device = object as! OMEMODevice
+            transaction.iterateKeysAndObjects(inCollection: OTRBaseMessage.collection) { (key, message: OTRBaseMessage, stop) in
+                XCTAssertEqual(message.text, messageText)
+                messageFound = true
+                stop = true
+            }
+            transaction.iterateKeysAndObjects(inCollection: OMEMODevice.collection) { (key, device: OMEMODevice, stop) in
                 XCTAssertNotNil(device.lastSeenDate)
-            })
-            
+            }
         })
         XCTAssertTrue(messageFound,"Found message")
     }