diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
index 18344d2c9..1aae439d1 100644
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@@ -7677,7 +7677,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 506;
+				CURRENT_PROJECT_VERSION = 507;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -7756,7 +7756,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 506;
+				CURRENT_PROJECT_VERSION = 507;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift
index 5f1e75595..1f728c06e 100644
--- a/Session/Meta/AppDelegate.swift
+++ b/Session/Meta/AppDelegate.swift
@@ -30,6 +30,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     // MARK: - Lifecycle
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Just in case we are running automated tests we should process environment variables
+        // before we do anything else
+        DeveloperSettingsViewModel.processUnitTestEnvVariablesIfNeeded()
+        
         Log.info("[AppDelegate] didFinishLaunchingWithOptions called.")
         startTime = CACurrentMediaTime()
         
diff --git a/Session/Settings/DeveloperSettingsViewModel.swift b/Session/Settings/DeveloperSettingsViewModel.swift
index 654dbb9a8..f172b7361 100644
--- a/Session/Settings/DeveloperSettingsViewModel.swift
+++ b/Session/Settings/DeveloperSettingsViewModel.swift
@@ -550,6 +550,31 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
     }
 }
 
+// MARK: - Automated Test Convenience
+
+extension DeveloperSettingsViewModel {
+    static func processUnitTestEnvVariablesIfNeeded() {
+#if targetEnvironment(simulator)
+        enum EnvironmentVariable: String {
+            case animationsEnabled
+        }
+        
+        ProcessInfo.processInfo.environment.forEach { key, value in
+            guard let variable: EnvironmentVariable = EnvironmentVariable(rawValue: key) else { return }
+            
+            switch variable {
+                case .animationsEnabled:
+                    guard value == "false" else { return }
+                    
+                    UIView.setAnimationsEnabled(false)
+            }
+        }
+#endif
+    }
+}
+
+// MARK: - DocumentPickerResult
+
 private class DocumentPickerResult: NSObject, UIDocumentPickerDelegate {
     private let onResult: (URL?) -> Void