               appElement.attrs[.MainWindow] = windowElement
             }
 
-            // There's a problem with intermittent failures when wrapping an eventually expectation
-            // inside waitUntil, so we have to do this. Currently only affects object properties.
-            var app: Swindler.Application!
-            waitUntil { done in initializeApp().then { appDelegate -> () in
-              app = Swindler.Application(delegate: appDelegate)
-              done()
-            } }
+            let app = Swindler.Application(delegate: initializeApp())
             expect(app.mainWindow.value).toEventuallyNot(beNil())
           }
         }

              observer?.emit(.ApplicationActivated, forElement: appElement)
            }

            return initializeApp().then { appDelegate -> () in
              let app = Swindler.Application(delegate: appDelegate)
              expect(app.isFrontmost.value).toEventually(beTrue())
            }
          }
        }


              observer.emit(.MainWindowChanged, forElement: windowElement)
            }

            let app = Swindler.Application(delegate: initializeApp())
            expect(app.mainWindow.value).toEventuallyNot(beNil())
          }
        }
