             self.FBSnapshotVerifyView(view)
             exp.fulfill()
         }
-        waitForExpectations(timeout: 1) { _ in }
+        let _ = waiter.wait(for: [exp], timeout: 1)
     }
 }

    /// Add the view controller on the window and wait infinitly
    func debugViewController(_ viewController: UIViewController) {
        rootViewController = viewController
        _ = expectation(description: "No expectation")
        waitForExpectations(timeout: 6666, handler: nil)
    }

    /// Presents the VC using a fresh rootVC in the host's main window.

import BSWInterfaceKit

class BSWSnapshotTest: FBSnapshotTestCase {

    let waiter = XCTWaiter()

    override func setUp() {
        super.setUp()

