         NVActivityIndicatorPresenter.sharedInstance.startAnimating(activityData)
         doAfter(approximateZero) {
             XCTAssertTrue(self.checkActivityViewAppeared())
-            NVActivityIndicatorPresenter.sharedInstance.stopAnimating()
+        }
+        NVActivityIndicatorPresenter.sharedInstance.stopAnimating()
+        doAfter(approximateZero) {
             XCTAssertFalse(self.checkActivityViewAppeared())
         }
     }
 
-    func xtestNonZeroDisplayTimeThreshold() {
+    func testNonZeroDisplayTimeThreshold() {
         let activityData = createActivityData(displayTimeThreshold: 100,
                                               minimumDisplayTime: 0)
 

        NVActivityIndicatorPresenter.sharedInstance.startAnimating(activityData)
        doAfter(50) {
            XCTAssertFalse(self.checkActivityViewAppeared())
            NVActivityIndicatorPresenter.sharedInstance.stopAnimating()
        }

        XCTAssertFalse(checkActivityViewAppeared())
        NVActivityIndicatorPresenter.sharedInstance.startAnimating(activityData)
        doAfter(150) {
            XCTAssertTrue(self.checkActivityViewAppeared())
            NVActivityIndicatorPresenter.sharedInstance.stopAnimating()
            XCTAssertFalse(self.checkActivityViewAppeared())
        }
    }

            XCTAssertTrue(self.checkActivityViewAppeared())
        }
        NVActivityIndicatorPresenter.sharedInstance.stopAnimating()
        doAfter(50) {
            XCTAssertTrue(self.checkActivityViewAppeared())
        }
        doAfter(50) {
