diff --git a/Signal/src/util/AppUpdateNag.m b/Signal/src/util/AppUpdateNag.m
index 5ba101829..9f776c761 100644
--- a/Signal/src/util/AppUpdateNag.m
+++ b/Signal/src/util/AppUpdateNag.m
@@ -58,6 +58,10 @@ NSString *const OWSPrimaryStorageAppUpgradeNagDate = @"TSStorageManagerAppUpgrad
 
 - (void)showAppUpgradeNagIfNecessary
 {
+    if (CurrentAppContext().isRunningTests) {
+        return;
+    }
+
     // Only show nag if we are "at rest" in the home view or registration view without any
     // alerts or dialogs showing.
     UIViewController *frontmostViewController =
diff --git a/Signal/test/Models/AccountManagerTest.swift b/Signal/test/Models/AccountManagerTest.swift
index 29b6cae43..9d9f3c16a 100644
--- a/Signal/test/Models/AccountManagerTest.swift
+++ b/Signal/test/Models/AccountManagerTest.swift
@@ -18,7 +18,13 @@ enum PushNotificationRequestResult: String {
 }
 
 class FailingTSAccountManager: TSAccountManager {
-    let phoneNumberAwaitingVerification = "+13235555555"
+    override public init(networkManager: TSNetworkManager, primaryStorage: OWSPrimaryStorage) {
+        SwiftAssertIsOnMainThread(#function)
+
+        super.init(networkManager: networkManager, primaryStorage: primaryStorage)
+
+        self.phoneNumberAwaitingVerification = "+13235555555"
+    }
 
     override func verifyAccount(withCode: String,
                                 pin: String?,
diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h
index c4316617d..50e0d75cf 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.h
+++ b/SignalServiceKit/src/Account/TSAccountManager.h
@@ -17,6 +17,11 @@ extern NSString *const kNSNotificationName_LocalNumberDidChange;
 
 @interface TSAccountManager : NSObject
 
+// This property is exposed for testing purposes only.
+#ifdef DEBUG
+@property (nonatomic, nullable) NSString *phoneNumberAwaitingVerification;
+#endif
+
 #pragma mark - Initializers
 
 - (instancetype)init NS_UNAVAILABLE;