diff --git a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingTests.m b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingTests.m
index ee7dfbb38..4de0d278d 100644
--- a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingTests.m
+++ b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingTests.m
@@ -44,6 +44,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OSInAppMessageAction.h"
 #import "OSInAppMessageBridgeEvent.h"
 #import "UIDeviceOverrider.h"
+#import "OSMessagingControllerOverrider.h"
 
 /*
  Test to make sure that OSInAppMessage correctly implements
@@ -122,6 +123,15 @@ - (void)setUp {
  */
 - (void)tearDown {
     [super tearDown];
+    [UnitTestCommonMethods runBackgroundThreads];
+    [OneSignal setInAppMessageClickHandler:nil];
+    [OneSignal pauseInAppMessages:true];
+
+    OneSignalOverrider.shouldOverrideSessionLaunchTime = false;
+
+    [OSMessagingController.sharedInstance resetState];
+
+    NSTimerOverrider.shouldScheduleTimers = true;
 }
 
 -(void)testIphoneSimulator {