diff --git a/Signal/src/util/Backup/OWSBackupLazyRestore.swift b/Signal/src/util/Backup/OWSBackupLazyRestore.swift
index 76f7c2139..4b19442d6 100644
--- a/Signal/src/util/Backup/OWSBackupLazyRestore.swift
+++ b/Signal/src/util/Backup/OWSBackupLazyRestore.swift
@@ -77,6 +77,9 @@ public class BackupLazyRestore: NSObject {
     public func runIfNecessary() {
         AssertIsOnMainThread()
 
+        guard !CurrentAppContext().isRunningTests else {
+            return
+        }
         guard AppReadiness.isAppReady() else {
             return
         }
diff --git a/Signal/test/Models/AccountManagerTest.swift b/Signal/test/Models/AccountManagerTest.swift
index 0f22ad67d..89505fd17 100644
--- a/Signal/test/Models/AccountManagerTest.swift
+++ b/Signal/test/Models/AccountManagerTest.swift
@@ -47,6 +47,10 @@ class VerifyingTSAccountManager: FailingTSAccountManager {
                                 success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
         success()
     }
+
+    override func performUpdateAccountAttributes() -> AnyPromise {
+        return AnyPromise(Promise.value(()))
+    }
 }
 
 class TokenObtainingTSAccountManager: VerifyingTSAccountManager {
diff --git a/Signal/test/util/SearcherTest.swift b/Signal/test/util/SearcherTest.swift
index fcfc405aa..def8866cb 100644
--- a/Signal/test/util/SearcherTest.swift
+++ b/Signal/test/util/SearcherTest.swift
@@ -294,7 +294,10 @@ class ConversationSearcherTest: SignalBaseTest {
         XCTAssertEqual(["My fax is: 222-333-4444"], bodies(forMessageResults: resultSet.messages))
     }
 
-    func bodies(forMessageResults messageResults: [ConversationSearchResult]) -> [String] {
+
+    // MARK: Helpers
+
+    func bodies<T>(forMessageResults messageResults: [ConversationSearchResult<T>]) -> [String] {
         var result = [String]()
 
         self.dbConnection.read { transaction in
@@ -322,8 +325,6 @@ class ConversationSearcherTest: SignalBaseTest {
         return result.sorted()
     }
 
-    // MARK: Helpers
-
     private func searchConversations(searchText: String) -> [ThreadViewModel] {
         let results = getResultSet(searchText: searchText)
         return results.conversations.map { $0.thread }