diff --git a/packages/desktop-gui/cypress/integration/global_mode_spec.coffee b/packages/desktop-gui/cypress/integration/global_mode_spec.coffee
index cd8d2e99dae6..fa4f84f53c87 100644
--- a/packages/desktop-gui/cypress/integration/global_mode_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/global_mode_spec.coffee
@@ -133,13 +133,10 @@ describe "Global Mode", ->
 
     describe "going back", ->
       beforeEach ->
-        cy.contains("Back").click()
-
-      it "returns to intro on click of back button", ->
-        cy.shouldBeOnIntro()
+        @closeProject = @util.deferred()
+        @ipc.closeProject.returns(@closeProject.promise)
 
-      it "removes project name from title", ->
-        cy.title().should("equal", "Cypress")
+        cy.contains("Back").click()
 
       it "removes ipc listeners", ->
         expect(@ipc.offOpenProject).to.be.called
@@ -148,3 +145,17 @@ describe "Global Mode", ->
 
       it "closes project", ->
         expect(@ipc.closeProject).to.be.called
+
+      it "shows loader", ->
+        cy.get(".loader")
+        cy.contains("Closing project...")
+
+      describe "when finished closing", ->
+        beforeEach ->
+          @closeProject.resolve()
+
+        it "goes to intro", ->
+          cy.shouldBeOnIntro()
+
+        it "removes project name from title", ->
+          cy.title().should("equal", "Cypress")
diff --git a/packages/desktop-gui/cypress/integration/project_nav_spec.coffee b/packages/desktop-gui/cypress/integration/project_nav_spec.coffee
index 2bf803f87bdc..9be75d4e60f8 100644
--- a/packages/desktop-gui/cypress/integration/project_nav_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/project_nav_spec.coffee
@@ -14,8 +14,8 @@ describe "Project Nav", ->
       cy.stub(@ipc, "getRuns").resolves(@runs)
       cy.stub(@ipc, "getSpecs").yields(null, @specs)
       cy.stub(@ipc, "getRecordKeys").resolves([])
-      cy.stub(@ipc, "launchBrowser")
       cy.stub(@ipc, "closeBrowser").resolves(null)
+      cy.stub(@ipc, "onBrowserClose")
       cy.stub(@ipc, "pingApiServer").resolves()
       cy.stub(@ipc, "closeProject")
       cy.stub(@ipc, "externalOpen")
@@ -26,6 +26,9 @@ describe "Project Nav", ->
       @openProject = @util.deferred()
       cy.stub(@ipc, "openProject").returns(@openProject.promise)
 
+      @launchBrowser = @util.deferred()
+      cy.stub(@ipc, "launchBrowser").returns(@launchBrowser.promise)
+
       start()
 
   context "project nav", ->
@@ -134,8 +137,8 @@ describe "Project Nav", ->
 
       context "browser opened after choosing spec", ->
         beforeEach ->
-          @ipc.launchBrowser.yields(null, {browserOpened: true})
           cy.contains(".file", "app_spec").click()
+          @launchBrowser.resolve()
 
         it "displays browser icon as opened", ->
           cy.get(".browsers-list>a").first().find("i")
@@ -150,25 +153,41 @@ describe "Project Nav", ->
 
         describe "stop browser", ->
           beforeEach ->
+            @closeBrowser = @util.deferred()
+            @ipc.closeBrowser.returns(@closeBrowser.promise)
+
             cy.get(".close-browser").click()
 
-          it "calls close:browser on click of stop button", ->
+          it "calls ipc close:browser", ->
             expect(@ipc.closeBrowser).to.be.called
 
-          it "hides close button on click of stop", ->
+          it "hides close button", ->
             cy.get(".close-browser").should("not.exist")
 
-          it "re-enables browser dropdown", ->
-            cy.get(".browsers-list>a").first()
-              .should("not.have.class", "disabled")
+          it "blocks the UI and shows closing loader while browser is closing", ->
+            cy.get(".ui-blocker")
+            cy.get(".browsers-list").find(".fa-refresh.fa-spin")
+            cy.contains("Closing Chrome 50")
 
-          it "displays default browser icon", ->
-            cy.get(".browsers-list>a").first()
-              .find(".fa-chrome")
+          describe "when browser is finished closing", ->
+            beforeEach ->
+              @closeBrowser.resolve()
+
+            it "re-enables browser dropdown", ->
+              cy.get(".browsers-list>a").first()
+                .should("not.have.class", "disabled")
+
+            it "displays default browser icon", ->
+              cy.get(".browsers-list>a").first()
+                .find(".fa-chrome")
+
+            it "unblocks the UI", ->
+              cy.get(".ui-blocker").should("not.exist")
 
         describe "browser is closed manually", ->
           beforeEach ->
-            @ipc.launchBrowser.yield(null, {browserClosed: true})
+            cy.stub(@ipc, "awaitBrowserClose").resolves()
+            @ipc.onBrowserClose.yield()
 
           it "hides close browser button", ->
             cy.get(".close-browser").should("not.be.visible")
diff --git a/packages/desktop-gui/cypress/integration/project_spec.coffee b/packages/desktop-gui/cypress/integration/project_spec.coffee
index 7aec8d18f9ba..5fa84a778513 100644
--- a/packages/desktop-gui/cypress/integration/project_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/project_spec.coffee
@@ -45,10 +45,20 @@ describe "Project", ->
     it "re-opens project if config changes", ->
       cy.shouldBeOnProjectSpecs().then =>
         @ipc.onConfigChanged.yield()
-        expect(@ipc.closeProject).to.be.called
-        expect(@ipc.openProject).to.be.called
+        cy.wrap(@ipc.closeProject).should("be.called")
+        cy.wrap(@ipc.openProject).should("be.called")
         cy.shouldBeOnProjectSpecs()
 
+  describe "opening", ->
+    beforeEach ->
+      @openProject = @util.deferred()
+      @ipc.openProject.returns(@openProject.promise)
+      @start()
+
+    it "shows loader", ->
+      cy.get(".loader")
+      cy.contains("Opening project...")
+
   describe "warnings", ->
     beforeEach ->
       @start()
diff --git a/packages/desktop-gui/cypress/integration/projects_list_spec.coffee b/packages/desktop-gui/cypress/integration/projects_list_spec.coffee
index 66831ef0554c..4168209a6dbb 100644
--- a/packages/desktop-gui/cypress/integration/projects_list_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/projects_list_spec.coffee
@@ -41,7 +41,9 @@ describe "Projects List", ->
       @start()
 
     it "loads projects and shows loader", ->
-      cy.get(".projects-list .loader").then =>
+      cy.get(".projects-list .loader")
+      .should("have.text", "Loading projects...")
+      .then =>
         expect(@ipc.getProjects).to.be.called
 
     describe "when loaded", ->
diff --git a/packages/desktop-gui/cypress/integration/runs_list_spec.coffee b/packages/desktop-gui/cypress/integration/runs_list_spec.coffee
index f586bbcc12ca..45814fd506cd 100644
--- a/packages/desktop-gui/cypress/integration/runs_list_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/runs_list_spec.coffee
@@ -72,6 +72,7 @@ describe "Runs List", ->
     it "pings api server", ->
       expect(@ipc.pingApiServer).to.be.called
       cy.get(".loader")
+      cy.contains("Loading runs...")
 
     describe "success", ->
       beforeEach ->
@@ -425,6 +426,7 @@ describe "Runs List", ->
 
             it "shows loading spinner", ->
               cy.get(".loader")
+              cy.contains("Loading runs...")
 
             it "shows runs when getting runs succeeds", ->
               @getRuns.resolve(@runs)
diff --git a/packages/desktop-gui/cypress/integration/settings_spec.coffee b/packages/desktop-gui/cypress/integration/settings_spec.coffee
index b6ceb975a130..020cd8c93863 100644
--- a/packages/desktop-gui/cypress/integration/settings_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/settings_spec.coffee
@@ -197,16 +197,23 @@ describe "Settings", ->
       newConfig.browsers = @browsers
       @openProject.resolve(newConfig)
 
-      @goToSettings()
-      cy.contains("Configuration").click()
+      @goToSettings().then =>
+        @openProject2ndCall = @util.deferred()
+        @ipc.openProject.onCall(1).returns(@openProject2ndCall.promise)
+        @ipc.onConfigChanged.yield()
 
-    it "displays updated config", ->
-      newConfig = @util.deepClone(@config)
-      newConfig.resolved.baseUrl.value = "http://localhost:7777"
-      @ipc.openProject.onCall(1).resolves(newConfig)
-      @ipc.onConfigChanged.yield()
+    it "re-opens the project", ->
+      cy.wrap(@ipc.openProject).should("be.calledTwice")
 
-      cy.contains("http://localhost:7777")
+    describe "when project re-opens", ->
+      beforeEach ->
+        newConfig = @util.deepClone(@config)
+        newConfig.resolved.baseUrl.value = "http://localhost:7777"
+        @openProject2ndCall.resolve(newConfig)
+
+      it "displays updated config", ->
+        cy.contains("Configuration").click()
+        cy.contains("http://localhost:7777")
 
   describe "errors", ->
     beforeEach ->
diff --git a/packages/desktop-gui/cypress/integration/setup_project_modal_spec.coffee b/packages/desktop-gui/cypress/integration/setup_project_modal_spec.coffee
index 3a1cb4a0cded..15c0657d264d 100644
--- a/packages/desktop-gui/cypress/integration/setup_project_modal_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/setup_project_modal_spec.coffee
@@ -48,6 +48,10 @@ describe "Set Up Project", ->
     beforeEach ->
       @getCurrentUser.resolve(@user)
 
+    it "shows loader while orgs load", ->
+      cy.get(".btn").contains("Set up project").click()
+      cy.get(".loader")
+
     describe "general behavior", ->
       beforeEach ->
         @getOrgs.resolve(@orgs)
@@ -343,6 +347,7 @@ describe "Set Up Project", ->
       beforeEach ->
         cy.stub(@ipc, "windowOpen").resolves()
         cy.stub(@ipc, "logIn").resolves(@user)
+        @getOrgs.resolve()
         cy.contains("button", "Log In with GitHub").click()
 
       it "shows setup", ->
diff --git a/packages/desktop-gui/cypress/integration/specs_list_spec.coffee b/packages/desktop-gui/cypress/integration/specs_list_spec.coffee
index 450fa6d7e2f3..e40ec624ed17 100644
--- a/packages/desktop-gui/cypress/integration/specs_list_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/specs_list_spec.coffee
@@ -10,9 +10,9 @@ describe "Specs List", ->
 
       cy.stub(@ipc, "getOptions").resolves({projectRoot: "/foo/bar"})
       cy.stub(@ipc, "getCurrentUser").resolves(@user)
-      cy.stub(@ipc, "getSpecs").yields(null, @specs)
+      cy.stub(@ipc, "getSpecs")
       cy.stub(@ipc, "closeBrowser").resolves(null)
-      cy.stub(@ipc, "launchBrowser")
+      cy.stub(@ipc, "launchBrowser").resolves()
       cy.stub(@ipc, "openFinder")
       cy.stub(@ipc, "externalOpen")
       cy.stub(@ipc, "onboardingClosed")
@@ -23,6 +23,11 @@ describe "Specs List", ->
 
       start()
 
+  it "shows loader", ->
+    @openProject.resolve(@config)
+    cy.get(".loader")
+    cy.contains("Loading specs...")
+
   describe "no specs", ->
     beforeEach ->
       @ipc.getSpecs.yields(null, [])
@@ -47,6 +52,7 @@ describe "Specs List", ->
 
   describe "first time onboarding specs", ->
     beforeEach ->
+      @ipc.getSpecs.yields(null, @specs)
       @config.isNewProject = true
       @openProject.resolve(@config)
 
@@ -123,10 +129,11 @@ describe "Specs List", ->
           cy
             .contains(".btn", "Run all specs").click()
             .then ->
-              launchArgs = @ipc.launchBrowser.lastCall.args
+              expect(@ipc.launchBrowser).to.be.called
 
-              expect(launchArgs[0].browser.name).to.eq "chrome"
-              expect(launchArgs[0].spec.name).to.eq "All Specs"
+              launchArgs = @ipc.launchBrowser.lastCall.args[0]
+              expect(launchArgs.browser.name).to.eq "chrome"
+              expect(launchArgs.spec.name).to.eq "All Specs"
 
         describe "all specs running in browser", ->
           beforeEach ->
@@ -266,16 +273,15 @@ describe "Specs List", ->
         @openProject.resolve(@config)
         cy.contains(".file a", "app_spec.coffee").as("firstSpec")
 
-      it "closes then launches browser on click of file", ->
+      it "launches browser on click of file", ->
         cy.get("@firstSpec")
           .click()
           .then ->
-            expect(@ipc.closeBrowser).to.be.called
+            expect(@ipc.launchBrowser).to.be.called
 
-            launchArgs = @ipc.launchBrowser.lastCall.args
-
-            expect(launchArgs[0].browser.name).to.equal("chrome")
-            expect(launchArgs[0].spec.relative).to.equal("cypress/integration/app_spec.coffee")
+            launchArgs = @ipc.launchBrowser.lastCall.args[0]
+            expect(launchArgs.browser.name).to.equal("chrome")
+            expect(launchArgs.spec.relative).to.equal("cypress/integration/app_spec.coffee")
 
       it "adds 'active' class on click", ->
         cy.get("@firstSpec")
@@ -315,9 +321,9 @@ describe "Specs List", ->
           cy.get("@deepSpec").should("have.class", "active")
 
     context "switching specs", ->
-
       beforeEach ->
         @ipc.getSpecs.yields(null, @specs)
+        @ipc.launchBrowser
         @openProject.resolve(@config)
         cy
           .get(".file").contains("a", "app_spec.coffee").as("firstSpec")
diff --git a/packages/desktop-gui/cypress/integration/update_banner_spec.coffee b/packages/desktop-gui/cypress/integration/update_banner_spec.coffee
index b50e8f4475ea..7c8f337ee223 100644
--- a/packages/desktop-gui/cypress/integration/update_banner_spec.coffee
+++ b/packages/desktop-gui/cypress/integration/update_banner_spec.coffee
@@ -18,6 +18,7 @@ describe "Update Banner", ->
       { @start, @ipc } = win.App
 
       cy.stub(@ipc, "getCurrentUser").resolves(@user)
+      cy.stub(@ipc, "openProject").resolves(@config)
       cy.stub(@ipc, "windowOpen")
       cy.stub(@ipc, "externalOpen")
 
@@ -98,7 +99,6 @@ describe "Update Banner", ->
   describe "in specs list", ->
     beforeEach ->
       cy.stub(@ipc, "getOptions").resolves({version: OLD_VERSION, projectRoot: "/foo/bar"})
-      cy.stub(@ipc, "openProject").resolves(@config)
       cy.stub(@ipc, "getSpecs").yields(null, @specs)
       @start()
       @updaterCheck.resolve(NEW_VERSION)
diff --git a/packages/desktop-gui/package.json b/packages/desktop-gui/package.json
index a0a0827e9a89..63b8e79e0552 100644
--- a/packages/desktop-gui/package.json
+++ b/packages/desktop-gui/package.json
@@ -49,7 +49,6 @@
     "rebuild-node-sass": "1.1.0",
     "react-bootstrap-modal": "4.2.0",
     "react-dom": "^16.7.0",
-    "react-loader": "^2.4.5",
-    "zunder": "6.3.0"
+    "zunder": "6.3.2"
   }
 }
diff --git a/packages/desktop-gui/src/app/app.jsx b/packages/desktop-gui/src/app/app.jsx
index 1e46d6b8ee37..1ac28a95afa3 100644
--- a/packages/desktop-gui/src/app/app.jsx
+++ b/packages/desktop-gui/src/app/app.jsx
@@ -1,7 +1,6 @@
 import _ from 'lodash'
 import { observer } from 'mobx-react'
 import React, { Component } from 'react'
-import Loader from 'react-loader'
 
 import appApi from '../lib/app-api'
 import C from '../lib/constants'
@@ -12,6 +11,7 @@ import viewStore from '../lib/view-store'
 
 import Intro from './intro'
 import Layout from './layout'
+import Loader from '../lib/loader'
 import Project from '../project/project'
 
 @observer
@@ -30,7 +30,7 @@ class App extends Component {
   render () {
     switch (viewStore.currentView.name) {
       case C.LOADING:
-        return <Loader color='#888' scale={0.5} />
+        return <Loader fullscreen />
       case C.INTRO:
         return (
           <Layout>
diff --git a/packages/desktop-gui/src/app/layout.jsx b/packages/desktop-gui/src/app/layout.jsx
index 580d618ebf66..92ed220d2d33 100644
--- a/packages/desktop-gui/src/app/layout.jsx
+++ b/packages/desktop-gui/src/app/layout.jsx
@@ -5,6 +5,7 @@ import GlobalError from './global-error'
 import Footer from '../footer/footer'
 import LoginModal from '../auth/login-modal'
 import UpdateBanner from '../update/update-banner'
+import UiBlocker from './ui-blocker'
 
 export default ({ children }) => {
   return (
@@ -15,6 +16,7 @@ export default ({ children }) => {
       <Footer />
       <LoginModal />
       <GlobalError />
+      <UiBlocker />
     </div>
   )
 }
diff --git a/packages/desktop-gui/src/app/nav.jsx b/packages/desktop-gui/src/app/nav.jsx
index cc4804330122..08c8bb33d496 100644
--- a/packages/desktop-gui/src/app/nav.jsx
+++ b/packages/desktop-gui/src/app/nav.jsx
@@ -8,6 +8,7 @@ import viewStore from '../lib/view-store'
 import ipc from '../lib/ipc'
 import { gravatarUrl } from '../lib/utils'
 import { Link, routes } from '../lib/routing'
+import projectsApi from '../projects/projects-api'
 
 import Dropdown from '../dropdown/dropdown'
 
@@ -51,7 +52,7 @@ export default class Nav extends Component {
     // global mode, on project page
     if (appStore.isGlobalMode && project) {
       return (
-        <Link to={routes.intro()}>
+        <Link to={routes.intro()} onClick={this._unloadProject}>
           <i className='fa fa-chevron-left'></i> Back
         </Link>
       )
@@ -122,12 +123,16 @@ export default class Nav extends Component {
 
   }
 
-  _select = (item) => {
+  _select (item) {
     if (item.id === 'logout') {
       authApi.logOut()
     }
   }
 
+  _unloadProject () {
+    return projectsApi.closeProject(viewStore.currentView.project)
+  }
+
   _showLogin () {
     authStore.setShowingLogin(true)
   }
diff --git a/packages/desktop-gui/src/app/ui-blocker.jsx b/packages/desktop-gui/src/app/ui-blocker.jsx
new file mode 100644
index 000000000000..33bdc2d35ab0
--- /dev/null
+++ b/packages/desktop-gui/src/app/ui-blocker.jsx
@@ -0,0 +1,16 @@
+import React from 'react'
+import { createPortal } from 'react-dom'
+import { observer } from 'mobx-react'
+
+import appStore from '../lib/app-store'
+
+const UiBlocker = observer(() => {
+  if (!appStore.isUiBlocked) return null
+
+  return createPortal(
+    <div className='ui-blocker' />,
+    document.getElementById('ui-blocker')
+  )
+})
+
+export default UiBlocker
diff --git a/packages/desktop-gui/src/app/ui-blocker.scss b/packages/desktop-gui/src/app/ui-blocker.scss
new file mode 100644
index 000000000000..701cde0d4a9c
--- /dev/null
+++ b/packages/desktop-gui/src/app/ui-blocker.scss
@@ -0,0 +1,8 @@
+.ui-blocker {
+  bottom: 0;
+  left: 0;
+  position: fixed;
+  right: 0;
+  top: 0;
+  z-index: 99999;
+}
diff --git a/packages/desktop-gui/src/auth/login-modal.jsx b/packages/desktop-gui/src/auth/login-modal.jsx
index 6f3ea1328d73..c25f0e777825 100644
--- a/packages/desktop-gui/src/auth/login-modal.jsx
+++ b/packages/desktop-gui/src/auth/login-modal.jsx
@@ -1,8 +1,8 @@
 import { observer } from 'mobx-react'
 import React, { Component } from 'react'
 import BootstrapModal from 'react-bootstrap-modal'
-import Loader from 'react-loader'
 
+import Loader from '../lib/loader'
 import LoginForm from './login-form'
 import authStore from './auth-store'
 import ipc from '../lib/ipc'
@@ -51,7 +51,7 @@ class LoginContent extends Component {
       return (
         <div className='modal-body login'>
           <BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
-          <Loader color='#888' scale={0.5}/>
+          <Loader />
         </div>
       )
     }
diff --git a/packages/desktop-gui/src/index.hbs b/packages/desktop-gui/src/index.hbs
index 59f83e139d96..66e1f72e2890 100644
--- a/packages/desktop-gui/src/index.hbs
+++ b/packages/desktop-gui/src/index.hbs
@@ -9,6 +9,7 @@
 </head>
 <body>
   <div id="app"></div>
+  <div id="ui-blocker"></div>
 
   <script>
     if (!!window.Cypress) {
diff --git a/packages/desktop-gui/src/lib/app-store.js b/packages/desktop-gui/src/lib/app-store.js
index 547067b562d1..3b418c37d47c 100644
--- a/packages/desktop-gui/src/lib/app-store.js
+++ b/packages/desktop-gui/src/lib/app-store.js
@@ -9,6 +9,7 @@ class AppStore {
   @observable version
   @observable localInstallNoticeDismissed = localData.get('local-install-notice-dimissed')
   @observable error
+  @observable isUiBlocked = false
 
   @computed get displayVersion () {
     return this.isDev ? `${this.version} (dev)` : this.version
@@ -48,6 +49,10 @@ class AppStore {
   @action setError (err) {
     this.error = err
   }
+
+  @action setUiBlocked (isUiBlocked) {
+    this.isUiBlocked = isUiBlocked
+  }
 }
 
 export default new AppStore()
diff --git a/packages/desktop-gui/src/lib/ipc.js b/packages/desktop-gui/src/lib/ipc.js
index 6194e6e5076c..f334501b35df 100644
--- a/packages/desktop-gui/src/lib/ipc.js
+++ b/packages/desktop-gui/src/lib/ipc.js
@@ -43,9 +43,11 @@ register('get:project:statuses')
 register('get:project:status')
 register('get:record:keys')
 register('get:specs', false)
-register('launch:browser', false)
+register('await:browser:close')
+register('launch:browser')
 register('log:in')
 register('log:out')
+register('on:browser:close', false)
 register('on:focus:tests', false)
 register('on:menu:clicked', false)
 register('open:finder')
diff --git a/packages/desktop-gui/src/lib/loader.jsx b/packages/desktop-gui/src/lib/loader.jsx
new file mode 100644
index 000000000000..48d32778ec0d
--- /dev/null
+++ b/packages/desktop-gui/src/lib/loader.jsx
@@ -0,0 +1,15 @@
+import cs from 'classnames'
+import React from 'react'
+
+const Loader = ({ children, className = '', fullscreen = false }) => (
+  <span className={cs('loader', className,
+    { 'loader-fullscreen': fullscreen }
+  )}>
+    <span className="spinner"></span>
+    <span className='loader-content'>
+      {children}
+    </span>
+  </span>
+)
+
+export default Loader
diff --git a/packages/desktop-gui/src/lib/loader.scss b/packages/desktop-gui/src/lib/loader.scss
new file mode 100644
index 000000000000..c92c681ed8d7
--- /dev/null
+++ b/packages/desktop-gui/src/lib/loader.scss
@@ -0,0 +1,55 @@
+.loader {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+
+  i {
+    font-size: 1.4em;
+    margin-right: 0.5em;
+  }
+}
+
+.loader-fullscreen {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+@mixin spinner-color($color) {
+  border-top: 0.2em solid rgba($color, 0.2);
+  border-right: 0.2em solid rgba($color, 0.2);
+  border-bottom: 0.2em solid rgba($color, 0.2);
+  border-left: 0.2em solid rgba($color, 0.8);
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+.spinner,
+.spinner:after {
+  border-radius: 50%;
+  display: block;
+  margin-right: 1em;
+  width: 2em;
+  height: 2em;
+}
+
+.spinner {
+  font-size: 10px;
+  position: relative;
+  text-indent: -9999em;
+  @include spinner-color(#666);
+  transform: translateZ(0);
+  animation: spin 1.5s infinite linear;
+}
+
+.loader-content {
+  color: #666;
+}
diff --git a/packages/desktop-gui/src/lib/routing.jsx b/packages/desktop-gui/src/lib/routing.jsx
index 522050382e46..239f5fb95613 100644
--- a/packages/desktop-gui/src/lib/routing.jsx
+++ b/packages/desktop-gui/src/lib/routing.jsx
@@ -1,13 +1,16 @@
 import React from 'react'
+import Promise from 'bluebird'
 
 import viewStore from './view-store'
 
 const Link = ({ children, to, onClick }) => {
   const navigate = (e) => {
     e.preventDefault()
-    if (onClick) onClick()
 
-    to.navigate()
+    Promise.try(() => onClick && onClick())
+    .then(() => {
+      to.navigate()
+    })
   }
 
   return (
diff --git a/packages/desktop-gui/src/lib/view-store.js b/packages/desktop-gui/src/lib/view-store.js
index 6aad29e7a413..1847afc70c2f 100644
--- a/packages/desktop-gui/src/lib/view-store.js
+++ b/packages/desktop-gui/src/lib/view-store.js
@@ -9,12 +9,6 @@ class ViewStore {
     name: C.LOADING,
   }
 
-  @action showLoading () {
-    this.currentView = {
-      name: C.LOADING,
-    }
-  }
-
   @action showApp () {
     if (appStore.projectRoot) {
       this.showProjectSpecs(projectsStore.getProjectByPath(appStore.projectRoot))
diff --git a/packages/desktop-gui/src/organizations/organizations-api.js b/packages/desktop-gui/src/organizations/organizations-api.js
index 6264a02c837f..633ce00e69cb 100644
--- a/packages/desktop-gui/src/organizations/organizations-api.js
+++ b/packages/desktop-gui/src/organizations/organizations-api.js
@@ -3,7 +3,11 @@ import orgsStore from './organizations-store'
 
 let pollId
 
-const getOrgs = () => {
+const getOrgs = (firstLoad = false) => {
+  if (firstLoad) {
+    orgsStore.setLoading(true)
+  }
+
   ipc.getOrgs()
   .then((orgs = []) => {
     orgsStore.setOrgs(orgs)
@@ -16,6 +20,9 @@ const getOrgs = () => {
 
     return null
   })
+  .finally(() => {
+    orgsStore.setLoading(false)
+  })
 
   return null
 }
diff --git a/packages/desktop-gui/src/organizations/organizations-store.js b/packages/desktop-gui/src/organizations/organizations-store.js
index 5e8667e73cd3..f32c89441037 100644
--- a/packages/desktop-gui/src/organizations/organizations-store.js
+++ b/packages/desktop-gui/src/organizations/organizations-store.js
@@ -7,23 +7,21 @@ export class Orgs {
   @observable orgs = []
   @observable error = null
   @observable isLoading = false
-  @observable isLoaded = false
 
   @action setOrgs (orgs) {
     this.orgs = _.map(orgs, (org) => {
-      return (
-        new Org(org)
-      )
+      return new Org(org)
     })
-
-    this.isLoading = false
-    this.isLoaded = true
   }
 
   @action setError (err) {
     this.error = err
   }
 
+  @action setLoading (isLoading) {
+    this.isLoading = isLoading
+  }
+
   getOrgById (id) {
     return _.find(this.orgs, { id })
   }
diff --git a/packages/desktop-gui/src/project-nav/browsers.jsx b/packages/desktop-gui/src/project-nav/browsers.jsx
index 141eada6336c..c0adaef6a622 100644
--- a/packages/desktop-gui/src/project-nav/browsers.jsx
+++ b/packages/desktop-gui/src/project-nav/browsers.jsx
@@ -4,6 +4,7 @@ import Tooltip from '@cypress/react-tooltip'
 import Dropdown from '../dropdown/dropdown'
 
 import projectsApi from '../projects/projects-api'
+import Project from '../project/project-model'
 
 @observer
 export default class Browsers extends Component {
@@ -17,7 +18,7 @@ export default class Browsers extends Component {
         {this._closeBrowserBtn()}
         <Dropdown
           className='browsers-list'
-          disabled={project.browserState === 'opened' || project.browserState === 'opening'}
+          disabled={project.isBrowserState(Project.BROWSER_OPENING, Project.BROWSER_OPEN, Project.BROWSER_CLOSING)}
           chosen={project.chosenBrowser}
           others={project.otherBrowsers}
           onSelect={this._onSelect}
@@ -30,16 +31,16 @@ export default class Browsers extends Component {
   }
 
   _closeBrowserBtn () {
-    if (this.props.project.browserState === 'opened') {
-      return (
-        <li className='close-browser'>
-          <button className='btn btn-xs btn-danger' onClick={this._closeBrowser.bind(this)}>
-            <i className='fa fa-fw fa-times'></i>
-            Stop
-          </button>
-        </li>
-      )
-    }
+    if (!this.props.project.isBrowserState(Project.BROWSER_OPEN)) return null
+
+    return (
+      <li className='close-browser'>
+        <button className='btn btn-xs btn-danger' onClick={this._closeBrowser.bind(this)}>
+          <i className='fa fa-fw fa-times'></i>
+          Stop
+        </button>
+      </li>
+    )
   }
 
   _closeBrowser = (e) => {
@@ -56,12 +57,15 @@ export default class Browsers extends Component {
     let icon
     let prefixText
 
-    if (project.browserState === 'opening') {
+    if (project.isBrowserState(Project.BROWSER_OPENING)) {
       icon = 'refresh fa-spin'
       prefixText = 'Opening'
-    } else if (project.browserState === 'opened') {
+    } else if (project.isBrowserState(Project.BROWSER_OPEN)) {
       icon = 'check-circle-o green'
       prefixText = 'Running'
+    } else if (project.isBrowserState(Project.BROWSER_CLOSING)) {
+      icon = 'refresh fa-spin'
+      prefixText = 'Closing'
     } else {
       icon = browser.icon
       prefixText = ''
diff --git a/packages/desktop-gui/src/project/project-model.js b/packages/desktop-gui/src/project/project-model.js
index 85c012cbfbb3..22ea2f749248 100644
--- a/packages/desktop-gui/src/project/project-model.js
+++ b/packages/desktop-gui/src/project/project-model.js
@@ -33,6 +33,11 @@ export default class Project {
   static INVALID = 'INVALID'
   static UNAUTHORIZED = 'UNAUTHORIZED'
 
+  static BROWSER_OPENING = 'BROWSER_OPENING'
+  static BROWSER_OPEN = 'BROWSER_OPEN'
+  static BROWSER_CLOSING = 'BROWSER_CLOSING'
+  static BROWSER_CLOSED = 'BROWSER_CLOSED'
+
   // persisted with api
   @observable id
   @observable name
@@ -47,10 +52,11 @@ export default class Project {
   // local state
   @observable isChosen = false
   @observable isLoading = false
+  @observable isClosing = false
   @observable isNew = false
   @observable browsers = []
   @observable onBoardingModalOpen = false
-  @observable browserState = 'closed'
+  @observable browserState = Project.BROWSER_CLOSED
   @observable resolvedConfig
   @observable error
   @observable warning
@@ -133,6 +139,10 @@ export default class Project {
     this.isLoading = isLoading
   }
 
+  @action setClosing (isClosing) {
+    this.isClosing = isClosing
+  }
+
   @action openModal () {
     this.onBoardingModalOpen = true
   }
@@ -141,16 +151,8 @@ export default class Project {
     this.onBoardingModalOpen = false
   }
 
-  @action browserOpening () {
-    this.browserState = 'opening'
-  }
-
-  @action browserOpened () {
-    this.browserState = 'opened'
-  }
-
-  @action browserClosed () {
-    this.browserState = 'closed'
+  @action setBrowserState (browserState) {
+    this.browserState = browserState
   }
 
   @action setBrowsers (browsers = []) {
@@ -231,6 +233,10 @@ export default class Project {
     return _.pick(this, 'id', 'path')
   }
 
+  isBrowserState (...browserStates) {
+    return _.includes(browserStates, this.browserState)
+  }
+
   serialize () {
     return _.pick(this, cacheProps)
   }
diff --git a/packages/desktop-gui/src/project/project.jsx b/packages/desktop-gui/src/project/project.jsx
index a2689ed09318..0de8261c2eef 100644
--- a/packages/desktop-gui/src/project/project.jsx
+++ b/packages/desktop-gui/src/project/project.jsx
@@ -1,12 +1,12 @@
 import React, { Component } from 'react'
 import { observer } from 'mobx-react'
-import Loader from 'react-loader'
 
 import C from '../lib/constants'
 import projectsApi from '../projects/projects-api'
 import appStore from '../lib/app-store'
 import viewStore from '../lib/view-store'
 
+import Loader from '../lib/loader'
 import Settings from '../settings/settings'
 import OnBoarding from './onboarding'
 import ProjectNav from '../project-nav/project-nav'
@@ -18,8 +18,6 @@ class Project extends Component {
   componentDidMount () {
     const { project } = this.props
 
-    project.setLoading(true)
-
     document.title = appStore.isGlobalMode ? project.displayName : project.path
 
     projectsApi.openProject(project)
@@ -27,23 +25,25 @@ class Project extends Component {
 
   componentWillUnmount () {
     document.title = 'Cypress'
-
-    projectsApi.closeProject(this.props.project)
   }
 
   render () {
-    if (this.props.project.isLoading) return <Loader color='#888' scale={0.5}/>
+    const { project } = this.props
+
+    if (project.isLoading) return <Loader fullscreen>Opening project...</Loader>
+
+    if (project.isClosing) return <Loader fullscreen>Closing project...</Loader>
 
-    if (this.props.project.error) return this._error()
+    if (project.error) return this._error()
 
     return (
       <div>
-        <ProjectNav project={this.props.project}/>
+        <ProjectNav project={project}/>
         <div className='project-content'>
           {this._warning()}
           {this._currentView()}
         </div>
-        <OnBoarding project={this.props.project}/>
+        <OnBoarding project={project}/>
       </div>
     )
   }
diff --git a/packages/desktop-gui/src/projects/projects-api.js b/packages/desktop-gui/src/projects/projects-api.js
index b5bd22847f53..cb92b673a250 100644
--- a/packages/desktop-gui/src/projects/projects-api.js
+++ b/packages/desktop-gui/src/projects/projects-api.js
@@ -1,13 +1,15 @@
 import _ from 'lodash'
 import Promise from 'bluebird'
 
-import ipc from '../lib/ipc'
-import localData from '../lib/local-data'
+import appStore from '../lib/app-store'
 import viewStore from '../lib/view-store'
-import projectsStore from '../projects/projects-store'
+import projectsStore from './projects-store'
 import specsStore from '../specs/specs-store'
 
+import ipc from '../lib/ipc'
+import localData from '../lib/local-data'
 import { getSpecs } from '../specs/specs-api'
+import Project from '../project/project-model'
 
 const saveToLocalStorage = () => {
   localData.set('projects', projectsStore.serializeProjects())
@@ -52,7 +54,6 @@ const addProject = (path) => {
 
   return ipc.addProject(path)
   .then((details) => {
-    project.setLoading(false)
     project.update(details)
     saveToLocalStorage()
   })
@@ -63,44 +64,76 @@ const addProject = (path) => {
   .return(project)
 }
 
-const runSpec = (project, spec, browser) => {
-  specsStore.setChosenSpec(spec)
-  project.setChosenBrowser(browser)
+const listenForBrowserClose = (project) => {
+  ipc.onBrowserClose(() => {
+    specsStore.setChosenSpec(null)
 
-  const launchBrowser = () => {
-    project.browserOpening()
+    appStore.setUiBlocked(true)
+    project.setBrowserState(Project.BROWSER_CLOSING)
 
-    ipc.launchBrowser({ browser, spec: spec.file }, (err, data = {}) => {
-      if (data.browserOpened) {
-        project.browserOpened()
-      }
+    ipc.awaitBrowserClose()
+    .catch((err) => {
+      project.setError(err)
+    })
+    .finally(() => {
+      project.setBrowserState(Project.BROWSER_CLOSED)
+      appStore.setUiBlocked(false)
+      ipc.offOnBrowserClose()
+    })
+  })
+}
 
-      if (data.browserClosed) {
-        project.browserClosed()
+const launchBrowser = (project, spec, browser) => {
+  appStore.setUiBlocked(true)
+  project.setBrowserState(Project.BROWSER_OPENING)
 
-        specsStore.setChosenSpec(null)
+  listenForBrowserClose(project)
 
-        ipc.offLaunchBrowser()
-      }
-    })
-  }
+  return ipc.launchBrowser({ browser, spec })
+  .then(() => {
+    project.setBrowserState(Project.BROWSER_OPEN)
+  })
+  .catch((err) => {
+    ipc.offBrowserClosed()
+    project.setBrowserState(Project.BROWSER_CLOSED)
 
-  return closeBrowser(null, spec)
-  .then(launchBrowser)
+    project.setError(err)
+  })
+  .finally(() => {
+    appStore.setUiBlocked(false)
+  })
 }
 
-const closeBrowser = (project, spec) => {
-  if (!spec) {
-    specsStore.setChosenSpec(null)
-  }
+const runSpec = (project, spec, browser) => {
+  return closeBrowser(project)
+  .then(() => {
+    specsStore.setChosenSpec(spec)
+    project.setChosenBrowser(browser)
+
+    return launchBrowser(project, spec.file, browser)
+  })
+}
+
+const closeBrowser = (project) => {
+  ipc.offOnBrowserClose()
 
-  if (project) {
-    project.browserClosed()
+  specsStore.setChosenSpec(null)
+
+  if (project.isBrowserState(Project.BROWSER_CLOSING, Project.BROWSER_CLOSED)) {
+    return Promise.resolve()
   }
 
-  ipc.offLaunchBrowser()
+  appStore.setUiBlocked(true)
+  project.setBrowserState(Project.BROWSER_CLOSING)
 
   return ipc.closeBrowser()
+  .catch((err) => {
+    project.setError(err)
+  })
+  .finally(() => {
+    project.setBrowserState(Project.BROWSER_CLOSED)
+    appStore.setUiBlocked(false)
+  })
 }
 
 let projectPollingId
@@ -114,17 +147,21 @@ const closeProject = (project) => {
   ipc.offOnProjectWarning()
   ipc.offOnConfigChanged()
 
-  return Promise.join(
-    closeBrowser(project),
-    ipc.closeProject()
-  )
+  return closeBrowser(project)
+  .then(() => {
+    appStore.setUiBlocked(true)
+    project.setClosing(true)
+
+    return ipc.closeProject()
+  })
+  .finally(() => {
+    project.setClosing(false)
+    appStore.setUiBlocked(false)
+  })
 }
 
 const openProject = (project) => {
-  specsStore.loading(true)
-
   const setProjectError = (err) => {
-    project.setLoading(false)
     project.setError(err)
   }
 
@@ -167,6 +204,9 @@ const openProject = (project) => {
     project.setWarning(warning)
   })
 
+  appStore.setUiBlocked(true)
+  project.setLoading(true)
+
   return ipc.openProject(project.path)
   .then((config = {}) => {
     updateConfig(config)
@@ -174,6 +214,9 @@ const openProject = (project) => {
 
     specsStore.setFilter(projectIdAndPath, localData.get(specsStore.getSpecsFilterId(projectIdAndPath)))
     project.setLoading(false)
+    appStore.setUiBlocked(false)
+    specsStore.setLoading(true)
+
     getSpecs(setProjectError)
 
     projectPollingId = setInterval(updateProjectStatus, 10000)
@@ -181,6 +224,10 @@ const openProject = (project) => {
     return updateProjectStatus()
   })
   .catch(setProjectError)
+  .finally(() => {
+    project.setLoading(false)
+    appStore.setUiBlocked(false)
+  })
 }
 
 const reopenProject = (project) => {
diff --git a/packages/desktop-gui/src/projects/projects-list.jsx b/packages/desktop-gui/src/projects/projects-list.jsx
index d32181ddc7c3..656b3cdc0e6e 100644
--- a/packages/desktop-gui/src/projects/projects-list.jsx
+++ b/packages/desktop-gui/src/projects/projects-list.jsx
@@ -1,11 +1,11 @@
 import _ from 'lodash'
 import React, { Component } from 'react'
 import { observer } from 'mobx-react'
-import Loader from 'react-loader'
 
 import projectsApi from './projects-api'
 import projectsStore from './projects-store'
 import { Link, routes } from '../lib/routing'
+import Loader from '../lib/loader'
 
 const ProjectListItem = observer(({ project, onSelect, onRemove }) => (
   <li>
@@ -57,7 +57,7 @@ class ProjectsList extends Component {
   }
 
   _content () {
-    if (projectsStore.isLoading) return <Loader color='#888' scale={0.5}/>
+    if (projectsStore.isLoading) return <Loader>Loading projects...</Loader>
 
     return (
       <ul>
diff --git a/packages/desktop-gui/src/runs/runs-list.jsx b/packages/desktop-gui/src/runs/runs-list.jsx
index 5476326ff2eb..8c032bbba4ef 100644
--- a/packages/desktop-gui/src/runs/runs-list.jsx
+++ b/packages/desktop-gui/src/runs/runs-list.jsx
@@ -1,7 +1,6 @@
 import _ from 'lodash'
 import React, { Component } from 'react'
 import { observer } from 'mobx-react'
-import Loader from 'react-loader'
 
 import ipc from '../lib/ipc'
 import authStore from '../auth/auth-store'
@@ -13,6 +12,7 @@ import Project from '../project/project-model'
 import orgsStore from '../organizations/organizations-store'
 
 import ErrorMessage from './error-message'
+import Loader from '../lib/loader'
 import LoginForm from '../auth/login-form'
 import Run from './runs-list-item'
 import PermissionMessage from './permission-message'
@@ -126,7 +126,7 @@ class RunsList extends Component {
 
     // pinging api server to see if we can show anything
     if (this.state.isLoading) {
-      return <Loader color='#888' scale={0.5}/>
+      return <Loader fullscreen>Loading runs...</Loader>
     }
 
     // no connection to api server, can't load any runs
@@ -187,7 +187,9 @@ class RunsList extends Component {
     }
 
     // OR the runs are loading for the first time
-    if (this.runsStore.isLoading && !this.runsStore.isLoaded) return <Loader color='#888' scale={0.5}/>
+    if (this.runsStore.isLoading && !this.runsStore.isLoaded) {
+      return <Loader fullscreen>Loading runs...</Loader>
+    }
 
     // OR there are no runs to show
     if (!this.runsStore.runs.length) {
diff --git a/packages/desktop-gui/src/runs/setup-project-modal.jsx b/packages/desktop-gui/src/runs/setup-project-modal.jsx
index 4a730aef25d4..be5830237da3 100644
--- a/packages/desktop-gui/src/runs/setup-project-modal.jsx
+++ b/packages/desktop-gui/src/runs/setup-project-modal.jsx
@@ -4,7 +4,6 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { observer } from 'mobx-react'
 import BootstrapModal from 'react-bootstrap-modal'
-import Loader from 'react-loader'
 
 import authStore from '../auth/auth-store'
 import ipc from '../lib/ipc'
@@ -12,6 +11,7 @@ import { gravatarUrl } from '../lib/utils'
 import orgsStore from '../organizations/organizations-store'
 import orgsApi from '../organizations/organizations-api'
 
+import Loader from '../lib/loader'
 import LoginForm from '../auth/login-form'
 
 @observer
@@ -62,7 +62,7 @@ class SetupProject extends Component {
   _poll () {
     if (orgsApi.isPolling()) return
 
-    orgsApi.getOrgs()
+    orgsApi.getOrgs(true)
     orgsApi.pollOrgs()
   }
 
@@ -75,8 +75,8 @@ class SetupProject extends Component {
       return this._loginMessage()
     }
 
-    if (!orgsStore.isLoaded) {
-      this._loading()
+    if (orgsStore.isLoading) {
+      return this._loading()
     }
 
     return (
@@ -125,7 +125,7 @@ class SetupProject extends Component {
     return (
       <div className='setup-project-modal modal-body os-dialog'>
         <BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
-        <Loader color='#888' scale={0.5} />
+        <Loader />
       </div>
     )
   }
@@ -141,7 +141,7 @@ class SetupProject extends Component {
         </div>
         <div>
           <input
-            autoFocus='true'
+            autoFocus={true}
             ref='projectName'
             type='text'
             className='form-control'
diff --git a/packages/desktop-gui/src/specs/specs-list.jsx b/packages/desktop-gui/src/specs/specs-list.jsx
index 07f20d8db845..8c2acb129984 100644
--- a/packages/desktop-gui/src/specs/specs-list.jsx
+++ b/packages/desktop-gui/src/specs/specs-list.jsx
@@ -2,16 +2,17 @@ import cs from 'classnames'
 import _ from 'lodash'
 import React, { Component } from 'react'
 import { observer } from 'mobx-react'
-import Loader from 'react-loader'
 
 import ipc from '../lib/ipc'
 import projectsApi from '../projects/projects-api'
 import specsStore, { allSpecsSpec } from './specs-store'
 
+import Loader from '../lib/loader'
+
 @observer
 class SpecsList extends Component {
   render () {
-    if (specsStore.isLoading) return <Loader color='#888' scale={0.5}/>
+    if (specsStore.isLoading) return <Loader fullscreen>Loading specs...</Loader>
 
     if (!specsStore.filter && !specsStore.specs.length) return this._empty()
 
diff --git a/packages/desktop-gui/src/specs/specs-store.js b/packages/desktop-gui/src/specs/specs-store.js
index e83b887db38c..bcdfe36e7982 100644
--- a/packages/desktop-gui/src/specs/specs-store.js
+++ b/packages/desktop-gui/src/specs/specs-store.js
@@ -36,7 +36,7 @@ export class SpecsStore {
     return this._tree(this._files)
   }
 
-  @action loading (bool) {
+  @action setLoading (bool) {
     this.isLoading = bool
   }
 
@@ -47,7 +47,7 @@ export class SpecsStore {
       })
     }))
 
-    this.isLoading = false
+    this.setLoading(false)
   }
 
   @action setChosenSpec (spec) {
diff --git a/packages/reporter/package.json b/packages/reporter/package.json
index f17a0fcfd6ff..441cfdcbbf76 100644
--- a/packages/reporter/package.json
+++ b/packages/reporter/package.json
@@ -47,6 +47,6 @@
     "rebuild-node-sass": "1.1.0",
     "sinon": "7.0.0",
     "sinon-chai": "3.2.0",
-    "zunder": "6.2.1"
+    "zunder": "6.3.2"
   }
 }
diff --git a/packages/runner/package.json b/packages/runner/package.json
index cda7717d5207..74a9cbcc6b34 100644
--- a/packages/runner/package.json
+++ b/packages/runner/package.json
@@ -46,6 +46,6 @@
     "rebuild-node-sass": "1.1.0",
     "sinon": "7.0.0",
     "sinon-chai": "3.2.0",
-    "zunder": "6.2.1"
+    "zunder": "6.3.2"
   }
 }
diff --git a/packages/server/__snapshots__/background_driver_events_spec.coffee.js b/packages/server/__snapshots__/6_background_driver_events_spec.coffee.js
similarity index 66%
rename from packages/server/__snapshots__/background_driver_events_spec.coffee.js
rename to packages/server/__snapshots__/6_background_driver_events_spec.coffee.js
index 8d74b231b9e9..2e06df42082b 100644
--- a/packages/server/__snapshots__/background_driver_events_spec.coffee.js
+++ b/packages/server/__snapshots__/6_background_driver_events_spec.coffee.js
@@ -1,4 +1,4 @@
-exports['e2e plugins sends driver events 1'] = `
+exports['e2e background driver events sends driver events 1'] = `
 
 ====================================================================================================
 
@@ -17,7 +17,92 @@ exports['e2e plugins sends driver events 1'] = `
   Running: background_driver_events_spec.coffee...                                         (1 of 1) 
 
 
+test:start: fails to get
+An error was thrown in your background file while executing the handler for the 'test:start' event.
+
+This error is being ignored because the event cannot affect the results of the run.
+
+The error we received was:
+
+Error: Error thrown synchronously from "test:start". Should be ignored.
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+
+internal:commandEnqueue: log you had logs?
+internal:commandEnqueue: get #non-existent
+internal:commandStart: log you had logs?
+internal:commandEnd: log you had logs?
+internal:commandStart: get #non-existent
+internal:commandRetry: get expected '#non-existent' to exist in the DOM
   1) fails to get
+test:end: fails to get
+
+Error: The following error was thrown by a plugin in the background process. We've stopped running your tests because the background process crashed.
+
+Error: Error thrown in promise from "test:end". Should be ignored.
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+
+
+  (Results)
+
+  ┌────────────────────────────────────────────────────┐
+  │ Tests:        0                                    │
+  │ Passing:      0                                    │
+  │ Failing:      1                                    │
+  │ Pending:      0                                    │
+  │ Skipped:      0                                    │
+  │ Screenshots:  1                                    │
+  │ Video:        true                                 │
+  │ Duration:     X seconds                            │
+  │ Spec Ran:     background_driver_events_spec.coffee │
+  └────────────────────────────────────────────────────┘
+
+
+  (Screenshots)
+
+  - /foo/bar/.projects/background-driver-events/cypress/screenshots/background_driver_events_spec.coffee/fails to get (failed).png (1280x720)
+
 
   0 passing
   1 failing
@@ -42,26 +127,6 @@ exports['e2e plugins sends driver events 1'] = `
 
 
 
-  (Results)
-
-  ┌────────────────────────────────────────────────────┐
-  │ Tests:        1                                    │
-  │ Passing:      0                                    │
-  │ Failing:      1                                    │
-  │ Pending:      0                                    │
-  │ Skipped:      0                                    │
-  │ Screenshots:  1                                    │
-  │ Video:        true                                 │
-  │ Duration:     X seconds                            │
-  │ Spec Ran:     background_driver_events_spec.coffee │
-  └────────────────────────────────────────────────────┘
-
-
-  (Screenshots)
-
-  - /foo/bar/.projects/background-driver-events/cypress/screenshots/background_driver_events_spec.coffee/fails to get (failed).png (1280x720)
-
-
   (Video)
 
   - Started processing:   Compressing to 32 CRF
@@ -75,9 +140,9 @@ exports['e2e plugins sends driver events 1'] = `
 
       Spec                                                Tests  Passing  Failing  Pending  Skipped 
   ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
-  │ ✖ background_driver_events_spec.coffee      XX:XX        1        -        1        -        - │
+  │ ✖ background_driver_events_spec.coffee      XX:XX        -        -        1        -        - │
   └────────────────────────────────────────────────────────────────────────────────────────────────┘
-    1 of 1 failed (100%)                        XX:XX        1        -        1        -        -  
+    1 of 1 failed (100%)                        XX:XX        -        -        1        -        -  
 
 
 `
diff --git a/packages/server/__snapshots__/6_background_server_events_spec.coffee.js b/packages/server/__snapshots__/6_background_server_events_spec.coffee.js
new file mode 100644
index 000000000000..219fff554c17
--- /dev/null
+++ b/packages/server/__snapshots__/6_background_server_events_spec.coffee.js
@@ -0,0 +1,177 @@
+exports['e2e background server events sends server events 1'] = `
+
+====================================================================================================
+
+  (Run Starting)
+
+  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+  │ Cypress:    1.2.3                                                                              │
+  │ Browser:    FooBrowser 88                                                                      │
+  │ Specs:      2 found (background_server_events_1_spec.coffee, background_server_events_2_spec.… │
+  └────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+run:start cypress/integration/background_server_events_1_spec.coffee
+run:start is awaited
+
+────────────────────────────────────────────────────────────────────────────────────────────────────
+                                                                                                    
+  Running: background_server_events_1_spec.coffee...                                       (1 of 2) 
+spec:start: cypress/integration/background_server_events_1_spec.coffee
+spec:start is awaited
+
+
+  ✓ passes
+
+  1 passing
+
+
+  (Results)
+
+  ┌──────────────────────────────────────────────────────┐
+  │ Tests:        1                                      │
+  │ Passing:      1                                      │
+  │ Failing:      0                                      │
+  │ Pending:      0                                      │
+  │ Skipped:      0                                      │
+  │ Screenshots:  0                                      │
+  │ Video:        true                                   │
+  │ Duration:     X seconds                              │
+  │ Spec Ran:     background_server_events_1_spec.coffee │
+  └──────────────────────────────────────────────────────┘
+
+
+  (Video)
+
+  - Started processing:   Compressing to 32 CRF
+  - Finished processing:  /foo/bar/.projects/background-server-events/cypress/videos/abc123.mp4 (X seconds)
+
+spec:end: cypress/integration/background_server_events_1_spec.coffee { tests: 1, passes: 1, failures: 0 }
+spec:end is awaited
+
+────────────────────────────────────────────────────────────────────────────────────────────────────
+                                                                                                    
+  Running: background_server_events_2_spec.coffee...                                       (2 of 2) 
+spec:start: cypress/integration/background_server_events_2_spec.coffee
+spec:start is awaited
+
+
+  1) fails
+
+  0 passing
+  1 failing
+
+  1)  fails:
+
+      AssertionError: expected true to be false
+      + expected - actual
+
+      -true
+      +false
+      
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+      at stack trace line
+
+
+
+
+  (Results)
+
+  ┌──────────────────────────────────────────────────────┐
+  │ Tests:        1                                      │
+  │ Passing:      0                                      │
+  │ Failing:      1                                      │
+  │ Pending:      0                                      │
+  │ Skipped:      0                                      │
+  │ Screenshots:  1                                      │
+  │ Video:        true                                   │
+  │ Duration:     X seconds                              │
+  │ Spec Ran:     background_server_events_2_spec.coffee │
+  └──────────────────────────────────────────────────────┘
+
+
+  (Screenshots)
+
+  - /foo/bar/.projects/background-server-events/cypress/screenshots/background_server_events_2_spec.coffee/fails (failed).png (1280x720)
+
+
+  (Video)
+
+  - Started processing:   Compressing to 32 CRF
+  - Finished processing:  /foo/bar/.projects/background-server-events/cypress/videos/abc123.mp4 (X seconds)
+
+spec:end: cypress/integration/background_server_events_2_spec.coffee { tests: 1, passes: 0, failures: 1 }
+spec:end is awaited
+run:end: { totalTests: 2, totalPassed: 1, totalFailed: 1 }
+run:end is awaited
+
+====================================================================================================
+
+  (Run Finished)
+
+
+      Spec                                                Tests  Passing  Failing  Pending  Skipped 
+  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+  │ ✔ background_server_events_1_spec.coff…     XX:XX        1        1        -        -        - │
+  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
+  │ ✖ background_server_events_2_spec.coff…     XX:XX        1        -        1        -        - │
+  └────────────────────────────────────────────────────────────────────────────────────────────────┘
+    1 of 2 failed (50%)                         XX:XX        2        1        1        -        -  
+
+
+`
+
+exports['e2e background server events fails run if server event handler throws 1'] = `
+
+====================================================================================================
+
+  (Run Starting)
+
+  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+  │ Cypress:    1.2.3                                                                              │
+  │ Browser:    FooBrowser 88                                                                      │
+  │ Specs:      1 found (background_server_events_throw.coffee)                                    │
+  └────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+
+────────────────────────────────────────────────────────────────────────────────────────────────────
+                                                                                                    
+  Running: background_server_events_throw.coffee...                                        (1 of 1) 
+An error was thrown in your background file while executing the handler for the 'spec:start' event.
+
+The error we received was:
+
+Error: spec:start throws error
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+    at stack trace line
+
+
+`
diff --git a/packages/server/lib/background/child/run_background.js b/packages/server/lib/background/child/run_background.js
index db4e47217a46..dcc6adc471ae 100644
--- a/packages/server/lib/background/child/run_background.js
+++ b/packages/server/lib/background/child/run_background.js
@@ -3,6 +3,7 @@ const debug = require('debug')('cypress:server:background:child')
 const Promise = require('bluebird')
 
 const driverEvents = require('./driver_events')
+const serverEvents = require('./server_events')
 const preprocessor = require('./preprocessor')
 const task = require('./task')
 const util = require('../util')
@@ -65,6 +66,7 @@ const load = (ipc, config, backgroundFile) => {
   register('_get:task:keys', () => {})
 
   register('driver:event', () => {})
+  register('server:event', () => {})
 
   Promise
   .try(() => {
@@ -101,6 +103,10 @@ const execute = (ipc, event, ids, args = []) => {
     case 'driver:event':
       driverEvents.execute(ipc, registeredEvents, ids, args)
 
+      return
+    case 'server:event':
+      serverEvents.wrap(ipc, registeredEvents, ids, args)
+
       return
     case '_get:task:keys':
       task.getKeys(ipc, registeredEvents, ids)
diff --git a/packages/server/lib/background/child/server_events.js b/packages/server/lib/background/child/server_events.js
new file mode 100644
index 000000000000..f2f6ef50c370
--- /dev/null
+++ b/packages/server/lib/background/child/server_events.js
@@ -0,0 +1,21 @@
+const _ = require('lodash')
+const util = require('../util')
+
+module.exports = {
+  wrap (ipc, events, ids, args) {
+    const eventName = args[0]
+
+    args = args.slice(1)
+    const event = _.find(events, { event: eventName })
+
+    const invoke = () => {
+      const handler = _.get(event, 'handler')
+
+      if (_.isFunction(handler)) {
+        return handler(...args)
+      }
+    }
+
+    util.wrapChildPromise(ipc, invoke, ids, args)
+  },
+}
diff --git a/packages/server/lib/background/index.coffee b/packages/server/lib/background/index.coffee
index bee0d710389e..6bb4b06340a7 100644
--- a/packages/server/lib/background/index.coffee
+++ b/packages/server/lib/background/index.coffee
@@ -112,10 +112,15 @@ module.exports = {
 
   execute: (event, args...) ->
     debug("execute background event '#{event}' with args: %o %o %o", args...)
-    registeredEvents[event](args...)
+
+    if backgroundProcess
+      registeredEvents[event](args...)
+    else
+      debug("background process killed - don't execute")
 
   ## for testing purposes
   _reset: ->
+    backgroundProcess = null
     registeredEvents = {}
     handlers = []
 }
diff --git a/packages/server/lib/background/preprocessor.coffee b/packages/server/lib/background/preprocessor.coffee
index 2a2c0b42fada..692a54e0d40f 100644
--- a/packages/server/lib/background/preprocessor.coffee
+++ b/packages/server/lib/background/preprocessor.coffee
@@ -42,12 +42,6 @@ baseEmitter = new EE()
 fileObjects = {}
 fileProcessors = {}
 
-setDefaultPreprocessor = ->
-  debug("set default preprocessor")
-
-  browserify = require("@cypress/browserify-preprocessor")
-  background.register("browser:filePreprocessor", browserify())
-
 background.registerHandler (ipc) ->
   ipc.on "preprocessor:rerun", (filePath) ->
     debug("ipc preprocessor:rerun event")
@@ -94,15 +88,17 @@ module.exports = {
         debug("base emitter native close event")
         fileObject.emit("close")
  
-    if not background.isRegistered("browser:filePreprocessor")
-      setDefaultPreprocessor(config)
-
     if config.isTextTerminal and fileProcessor = fileProcessors[filePath]
       debug("headless and already processed")
       return fileProcessor
 
     preprocessor = fileProcessors[filePath] = Promise.try ->
-      background.execute("browser:filePreprocessor", fileObject)
+      if background.isRegistered("browser:filePreprocessor")
+        background.execute("browser:filePreprocessor", fileObject)
+      else
+        debug("execute default preprocessor")
+        browserify = require("@cypress/browserify-preprocessor")
+        browserify()(fileObject)
 
     return preprocessor
 
diff --git a/packages/server/lib/background/server_events.coffee b/packages/server/lib/background/server_events.coffee
new file mode 100644
index 000000000000..df4933fec118
--- /dev/null
+++ b/packages/server/lib/background/server_events.coffee
@@ -0,0 +1,13 @@
+Promise = require("bluebird")
+
+errors = require("../errors")
+background = require("../background")
+
+module.exports = {
+  execute: (eventName, args...) ->
+    if background.isRegistered("server:event")
+      Promise.try ->
+        background.execute("server:event", eventName, args...)
+      .catch (err) ->
+        errors.throw("BACKGROUND_SERVER_EVENT_ERROR", eventName, err?.stack or err?.message or err)
+}
diff --git a/packages/server/lib/browsers/index.coffee b/packages/server/lib/browsers/index.coffee
index 2e40504d707e..044694efa3f3 100644
--- a/packages/server/lib/browsers/index.coffee
+++ b/packages/server/lib/browsers/index.coffee
@@ -110,9 +110,6 @@ module.exports = {
         ## give a little padding around
         ## the browser opening
         Promise.delay(1000)
-        .then ->
-          options.onBrowserOpen()
-
-          return instance
+        .return(instance)
 
 }
diff --git a/packages/server/lib/errors.coffee b/packages/server/lib/errors.coffee
index 3049deadffe7..5d9a0c906cc8 100644
--- a/packages/server/lib/errors.coffee
+++ b/packages/server/lib/errors.coffee
@@ -661,6 +661,14 @@ getMsgByType = (type, arg1 = {}, arg2) ->
 
       We looked but did not find a #{chalk.blue('cypress.json')} file in this folder: #{chalk.blue(arg1)}
       """
+    when "BACKGROUND_SERVER_EVENT_ERROR"
+      """
+      An error was thrown in your background file while executing the handler for the '#{chalk.blue(arg1)}' event.
+
+      The error we received was:
+
+      #{chalk.yellow(arg2)}
+      """
     when "REPATHED_BACKGROUND_FILE"
       """
       The "plugins file" has been renamed to the "background file" and has a new default path.
diff --git a/packages/server/lib/gui/events.coffee b/packages/server/lib/gui/events.coffee
index 314dda806dfe..0dcd3414e257 100644
--- a/packages/server/lib/gui/events.coffee
+++ b/packages/server/lib/gui/events.coffee
@@ -60,6 +60,9 @@ handleEvent = (options, bus, event, id, type, arg) ->
     when "on:project:warning"
       onBus("project:warning")
 
+    when "on:browser:close"
+      onBus("browser:close")
+
     when "gui:error"
       logs.error(arg)
       .then(sendNull)
@@ -100,14 +103,18 @@ handleEvent = (options, bus, event, id, type, arg) ->
       .then(send)
       .catch(sendErr)
 
+    when "await:browser:close"
+      openProject.specEnd()
+      .then(send)
+      .catch(sendErr)
+
     when "launch:browser"
-      openProject.launch(arg.browser, arg.spec, {
+      openProject.launchBrowser(arg.browser, arg.spec, {
         projectRoot: options.projectRoot
-        onBrowserOpen: ->
-          send({browserOpened: true})
         onBrowserClose: ->
-          send({browserClosed: true})
+          bus.emit("browser:close")
       })
+      .then(send)
       .catch(sendErr)
 
     when "window:open"
diff --git a/packages/server/lib/modes/run.coffee b/packages/server/lib/modes/run.coffee
index ea3e8c9564ab..2296d95eb249 100644
--- a/packages/server/lib/modes/run.coffee
+++ b/packages/server/lib/modes/run.coffee
@@ -26,6 +26,7 @@ terminal   = require("../util/terminal")
 specsUtil  = require("../util/specs")
 humanTime  = require("../util/human_time")
 electronApp = require("../util/electron_app")
+serverEvents = require("../background/server_events")
 
 color = (val, c) ->
   chalk[c](val)
@@ -579,7 +580,7 @@ module.exports = {
 
     browserOpts.projectRoot = projectRoot
 
-    openProject.launch(browser, spec, browserOpts)
+    openProject.launchBrowser(browser, spec, browserOpts)
 
   listenForProjectEnd: (project, exit) ->
     new Promise (resolve) ->
@@ -741,9 +742,11 @@ module.exports = {
     }
 
   runSpecs: (options = {}) ->
+    ## TODO: add ciGroupId to these options and pass to 'run:start' event
     { config, browser, sys, headed, outputPath, specs, specPattern, beforeSpecRun, afterSpecRun, runUrl, parallel, group } = options
 
     isHeadless = browser.name is "electron" and not headed
+    cypressVersion = pkg.version
 
     browser.isHeadless = isHeadless
     browser.isHeaded = not isHeadless
@@ -752,21 +755,21 @@ module.exports = {
       startedTestsAt: null
       endedTestsAt: null
       totalDuration: null
-      totalSuites: null,
-      totalTests: null,
-      totalFailed: null,
-      totalPassed: null,
-      totalPending: null,
-      totalSkipped: null,
-      runs: null,
-      browserPath: browser.path,
-      browserName: browser.name,
-      browserVersion: browser.version,
-      osName: sys.osName,
-      osVersion: sys.osVersion,
-      cypressVersion: pkg.version,
-      runUrl: runUrl,
-      config,
+      totalSuites: null
+      totalTests: null
+      totalFailed: null
+      totalPassed: null
+      totalPending: null
+      totalSkipped: null
+      runs: null
+      browserPath: browser.path
+      browserName: browser.name
+      browserVersion: browser.version
+      osName: sys.osName
+      osVersion: sys.osVersion
+      cypressVersion: pkg.version
+      runUrl: runUrl
+      config
     }
 
     displayRunStarting({
@@ -785,15 +788,31 @@ module.exports = {
       .get("results")
       .tap (results) ->
         debug("spec results %o", results)
+        serverEvents.execute("spec:end", spec, results)
+
+    Promise.try ->
+      runDetails = {
+        config
+        browser
+        system: sys
+        cypressVersion
+        specs
+        specPattern
+        runUrl
+        parallel
+        group
+      }
 
-    iterateThroughSpecs({
-      specs
-      config
-      parallel
-      runEachSpec
-      afterSpecRun
-      beforeSpecRun
-    })
+      serverEvents.execute("run:start", runDetails)
+    .then ->
+      iterateThroughSpecs({
+        specs
+        config
+        parallel
+        runEachSpec
+        afterSpecRun
+        beforeSpecRun
+      })
     .then (runs = []) ->
       results.startedTestsAt = start = getRun(_.first(runs), "stats.wallClockStartedAt")
       results.endedTestsAt = end = getRun(_.last(runs), "stats.wallClockEndedAt")
@@ -808,7 +827,10 @@ module.exports = {
 
       debug("final results of all runs: %o", results)
 
-      writeOutput(outputPath, results)
+      Promise.try ->
+        serverEvents.execute("run:end", results)
+      .then ->
+        writeOutput(outputPath, results)
       .return(results)
 
   runSpec: (spec = {}, options = {}, estimated) ->
@@ -826,34 +848,36 @@ module.exports = {
 
     screenshots = []
 
-    ## we know we're done running headlessly
-    ## when the renderer has connected and
-    ## finishes running all of the tests.
-    ## we're using an event emitter interface
-    ## to gracefully handle this in promise land
-
-    ## if we've been told to record and we're not spawning a headed browser
     browserCanBeRecorded = (name) ->
       name is "electron" and isHeadless
 
-    if video
-      if browserCanBeRecorded(browserName)
-        if not videosFolder
-          throw new Error("Missing videoFolder for recording")
+    if video and browserCanBeRecorded(browserName)
+      if not videosFolder
+        throw new Error("Missing videoFolder for recording")
 
-        name  = path.join(videosFolder, spec.name + ".mp4")
-        cname = path.join(videosFolder, spec.name + "-compressed.mp4")
+      name  = path.join(videosFolder, spec.name + ".mp4")
+      cname = path.join(videosFolder, spec.name + "-compressed.mp4")
 
-        recording = @createRecording(name)
-      else
-        console.log("")
+    ## we know we're done running headlessly
+    ## when the renderer has connected and
+    ## finishes running all of the tests.
+    ## we're using an event emitter interface
+    ## to gracefully handle this in promise land
 
-        if browserName is "electron" and isHeaded
-          errors.warning("CANNOT_RECORD_VIDEO_HEADED")
+    Promise.try ->
+      serverEvents.execute("spec:start", spec)
+    .then =>
+      if video
+        if browserCanBeRecorded(browserName)
+          @createRecording(name)
         else
-          errors.warning("CANNOT_RECORD_VIDEO_FOR_THIS_BROWSER", browserName)
+          console.log("")
+
+          if browserName is "electron" and isHeaded
+            errors.warning("CANNOT_RECORD_VIDEO_HEADED")
+          else
+            errors.warning("CANNOT_RECORD_VIDEO_FOR_THIS_BROWSER", browserName)
 
-    Promise.resolve(recording)
     .then (props = {}) =>
       ## extract the started + ended promises from recording
       {start, end, write} = props
diff --git a/packages/server/lib/open_project.coffee b/packages/server/lib/open_project.coffee
index 39e48346cc6f..8a0acc4aa8e8 100644
--- a/packages/server/lib/open_project.coffee
+++ b/packages/server/lib/open_project.coffee
@@ -8,6 +8,7 @@ Project   = require("./project")
 browsers  = require("./browsers")
 specsUtil = require("./util/specs")
 preprocessor = require("./background/preprocessor")
+serverEvents = require("./background/server_events")
 
 create = ->
   openProject     = null
@@ -25,9 +26,18 @@ create = ->
       else
         Promise.resolve(null)
 
+  specEnd = ->
+    Promise.try ->
+      return if not openProject? or openProject.isTextTerminal
+
+      serverEvents.execute("spec:end", openProject.spec)
+
   return {
     reset: tryToCall("reset")
 
+    ## for testing purposes
+    __reset: reset
+
     getConfig: tryToCall("getConfig")
 
     createCiProject: tryToCall("createCiProject")
@@ -40,9 +50,11 @@ create = ->
 
     emit: tryToCall("emit")
 
+    specEnd
+
     getProject: -> openProject
 
-    launch: (browser, spec, options = {}) ->
+    launchBrowser: (browser, spec, options = {}) ->
       debug("resetting project state, preparing to launch browser")
 
       la(_.isPlainObject(browser), "expected browser object:", browser)
@@ -111,7 +123,11 @@ create = ->
               spec.relative
             )
 
-            browsers.open(browserName, options, automation)
+            Promise.try ->
+              if not openProject.isTextTerminal
+                serverEvents.execute("spec:start", spec)
+            .then ->
+              browsers.open(browserName, options, automation)
 
     getSpecChanges: (options = {}) ->
       currentSpecs = null
@@ -159,26 +175,22 @@ create = ->
 
     closeBrowser: ->
       browsers.close()
-
-    closeOpenProjectAndBrowsers: ->
-      Promise.all([
-        @closeBrowser()
-        openProject.close() if openProject
-      ])
       .then ->
-        reset()
-
-        return null
+        specEnd()
 
     close:  ->
       debug("closing opened project")
 
       @clearSpecInterval()
-      @closeOpenProjectAndBrowsers()
+
+      Promise.try ->
+        openProject.close() if openProject
+      .then ->
+        reset()
 
     create: (path, args = {}, options = {}) ->
       ## store the currently open project
-      openProject = Project(path)
+      openProject = Project(path, options)
 
       _.defaults(options, {
         onReloadBrowser: (url, browser) =>
diff --git a/packages/server/lib/project.coffee b/packages/server/lib/project.coffee
index 12f2167e0dd2..8a084d364e91 100644
--- a/packages/server/lib/project.coffee
+++ b/packages/server/lib/project.coffee
@@ -27,15 +27,16 @@ preprocessor = require("./background/preprocessor")
 fs          = require("./util/fs")
 settings    = require("./util/settings")
 specsUtil   = require("./util/specs")
+serverEvents = require("./background/server_events")
 
 localCwd = cwd()
 
 multipleForwardSlashesRe = /[^:\/\/](\/{2,})/g
 
 class Project extends EE
-  constructor: (projectRoot) ->
+  constructor: (projectRoot, options = {}) ->
     if not (@ instanceof Project)
-      return new Project(projectRoot)
+      return new Project(projectRoot, options)
 
     if not projectRoot
       throw new Error("Instantiating lib/project requires a projectRoot!")
@@ -51,6 +52,7 @@ class Project extends EE
     @server      = null
     @memoryCheck = null
     @automation  = null
+    @isTextTerminal = options.isTextTerminal
 
     debug("Project created %s", @projectRoot)
 
@@ -120,6 +122,9 @@ class Project extends EE
             @checkSupportFile(cfg)
             @watchBackgroundFile(cfg, options)
           )
+        .then =>
+          if not @isTextTerminal
+            serverEvents.execute("run:start")
 
     # return our project instance
     .return(@)
@@ -133,11 +138,15 @@ class Project extends EE
 
     background.init(cfg, {
       onError: (err) ->
-        debug('got background error', err.stack)
+        debug("background unexpected error:", err.stack)
 
         browsers.close()
         options.onError(err)
     })
+    .catch (err) ->
+      debug("background init error:", err.stack)
+      browsers.close()
+      throw err
 
   getRuns: ->
     Promise.all([
@@ -171,6 +180,9 @@ class Project extends EE
     )
     .then ->
       process.chdir(localCwd)
+    .then =>
+      if not @isTextTerminal
+        serverEvents.execute("run:end")
 
   checkSupportFile: (cfg) ->
     if supportFile = cfg.supportFile
diff --git a/packages/server/test/e2e/background_driver_events_spec.coffee b/packages/server/test/e2e/6_background_driver_events_spec.coffee
similarity index 89%
rename from packages/server/test/e2e/background_driver_events_spec.coffee
rename to packages/server/test/e2e/6_background_driver_events_spec.coffee
index 17ffcfc18a11..cfd242d9060e 100644
--- a/packages/server/test/e2e/background_driver_events_spec.coffee
+++ b/packages/server/test/e2e/6_background_driver_events_spec.coffee
@@ -3,7 +3,7 @@
 e2e      = require("../support/helpers/e2e")
 Fixtures = require("../support/helpers/fixtures")
 
-describe "e2e plugins", ->
+describe "e2e background driver events", ->
   e2e.setup()
 
   it "sends driver events", ->
diff --git a/packages/server/test/e2e/6_background_server_events_spec.coffee b/packages/server/test/e2e/6_background_server_events_spec.coffee
new file mode 100644
index 000000000000..5556bc002532
--- /dev/null
+++ b/packages/server/test/e2e/6_background_server_events_spec.coffee
@@ -0,0 +1,19 @@
+e2e      = require("../support/helpers/e2e")
+Fixtures = require("../support/helpers/fixtures")
+
+describe "e2e background server events", ->
+  e2e.setup()
+
+  it "sends server events", ->
+    e2e.exec(@, {
+      project: Fixtures.projectPath("background-server-events")
+      snapshot: true
+      expectedExitCode: 1
+    })
+
+  it "fails run if server event handler throws", ->
+    e2e.exec(@, {
+      project: Fixtures.projectPath("background-server-events-throw")
+      snapshot: true
+      expectedExitCode: 1
+    })
diff --git a/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress.json b/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress/background/index.js b/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress/background/index.js
new file mode 100644
index 000000000000..fa5b509ac132
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress/background/index.js
@@ -0,0 +1,5 @@
+module.exports = (on) => {
+  on('spec:start', () => {
+    throw new Error('spec:start throws error')
+  })
+}
diff --git a/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress/integration/background_server_events_throw.coffee b/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress/integration/background_server_events_throw.coffee
new file mode 100644
index 000000000000..acdf88bfebf5
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events-throw/cypress/integration/background_server_events_throw.coffee
@@ -0,0 +1,2 @@
+it "passes", ->
+  expect(true).to.be.true
diff --git a/packages/server/test/support/fixtures/projects/background-server-events/cypress.json b/packages/server/test/support/fixtures/projects/background-server-events/cypress.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events/cypress.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/server/test/support/fixtures/projects/background-server-events/cypress/background/index.js b/packages/server/test/support/fixtures/projects/background-server-events/cypress/background/index.js
new file mode 100644
index 000000000000..b500dc863b97
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events/cypress/background/index.js
@@ -0,0 +1,41 @@
+/* eslint-disable no-console */
+const Promise = require('bluebird')
+
+module.exports = (on) => {
+  on('run:start', (runDetails) => {
+    console.log('run:start', runDetails.specs[0].relative)
+
+    return Promise.delay(10).then(() => {
+      return console.log('run:start is awaited')
+    })
+  })
+
+  on('spec:start', (spec) => {
+    console.log('spec:start:', spec.relative)
+
+    return Promise.delay(10).then(() => {
+      return console.log('spec:start is awaited')
+    })
+  })
+
+  on('spec:end', (spec, results) => {
+    const { stats } = results
+    const { tests, passes, failures } = stats
+
+    console.log('spec:end:', spec.relative, { tests, passes, failures })
+
+    return Promise.delay(10).then(() => {
+      return console.log('spec:end is awaited')
+    })
+  })
+
+  on('run:end', (results) => {
+    const { totalTests, totalPassed, totalFailed } = results
+
+    console.log('run:end:', { totalTests, totalPassed, totalFailed })
+
+    return Promise.delay(10).then(() => {
+      return console.log('run:end is awaited')
+    })
+  })
+}
diff --git a/packages/server/test/support/fixtures/projects/background-server-events/cypress/integration/background_server_events_1_spec.coffee b/packages/server/test/support/fixtures/projects/background-server-events/cypress/integration/background_server_events_1_spec.coffee
new file mode 100644
index 000000000000..acdf88bfebf5
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events/cypress/integration/background_server_events_1_spec.coffee
@@ -0,0 +1,2 @@
+it "passes", ->
+  expect(true).to.be.true
diff --git a/packages/server/test/support/fixtures/projects/background-server-events/cypress/integration/background_server_events_2_spec.coffee b/packages/server/test/support/fixtures/projects/background-server-events/cypress/integration/background_server_events_2_spec.coffee
new file mode 100644
index 000000000000..eef69d6f6e7a
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/background-server-events/cypress/integration/background_server_events_2_spec.coffee
@@ -0,0 +1,2 @@
+it "fails", ->
+  expect(true).to.be.false
diff --git a/packages/server/test/unit/background/child/run_background_spec.coffee b/packages/server/test/unit/background/child/run_background_spec.coffee
index 8097a1b5bcf0..e1d7ea32c234 100644
--- a/packages/server/test/unit/background/child/run_background_spec.coffee
+++ b/packages/server/test/unit/background/child/run_background_spec.coffee
@@ -114,11 +114,10 @@ describe "lib/background/child/run_background", ->
       sinon.stub(preprocessor, "wrap")
       @onFilePreprocessor = sinon.stub().resolves()
       @beforeBrowserLaunch = sinon.stub().resolves()
-      @taskRequested = sinon.stub().resolves("foo")
       backgroundFn = (register) =>
         register("browser:filePreprocessor", @onFilePreprocessor)
         register("browser:launch", @beforeBrowserLaunch)
-        register("task", @taskRequested)
+        register("task", {})
       mockery.registerMock("background-file", backgroundFn)
       runBackground(@process, @ipc, "background-file")
       @ipc.on.withArgs("load").yield()
@@ -138,7 +137,7 @@ describe "lib/background/child/run_background", ->
 
       it "invokes registered function when invoked by preprocessor handler", ->
         @ipc.on.withArgs("execute").yield("browser:filePreprocessor", @ids, [])
-        preprocessor.wrap.lastCall.args[1](3, ["one", "two"])
+        preprocessor.wrap.lastCall.args[1](4, ["one", "two"])
         expect(@onFilePreprocessor).to.be.calledWith("one", "two")
 
     context "browser:launch", ->
@@ -158,7 +157,7 @@ describe "lib/background/child/run_background", ->
       it "invokes registered function when invoked by preprocessor handler", ->
         @ipc.on.withArgs("execute").yield("browser:launch", @ids, [])
         args = ["one", "two"]
-        util.wrapChildPromise.lastCall.args[1](4, args)
+        util.wrapChildPromise.lastCall.args[1](5, args)
         expect(@beforeBrowserLaunch).to.be.calledWith("one", "two")
 
     context "task", ->
diff --git a/packages/server/test/unit/background/index_spec.coffee b/packages/server/test/unit/background/index_spec.coffee
index 6b00393d4a2e..3d062ba48c50 100644
--- a/packages/server/test/unit/background/index_spec.coffee
+++ b/packages/server/test/unit/background/index_spec.coffee
@@ -172,6 +172,7 @@ describe "lib/background/index", ->
   context "#register", ->
     it "registers callback for event", ->
       foo = sinon.spy()
+      background.init({ backgroundFile: "background-file" })
       background.register("foo", foo)
       background.execute("foo")
       expect(foo).to.be.called
@@ -191,8 +192,15 @@ describe "lib/background/index", ->
       expect(background.isRegistered("foo")).to.be.false
 
   context "#execute", ->
-    it "calls the callback registered for the event", ->
+    it "calls the callback registered for the event if background process has been initialized", ->
       foo = sinon.spy()
+      background.init({ backgroundFile: "background-file" })
       background.register("foo", foo)
       background.execute("foo", "arg1", "arg2")
       expect(foo).to.be.calledWith("arg1", "arg2")
+
+    it "does not call the callback if background process has been initialized", ->
+      foo = sinon.spy()
+      background.register("foo", foo)
+      background.execute("foo", "arg1", "arg2")
+      expect(foo).not.to.be.called
diff --git a/packages/server/test/unit/background/preprocessor_spec.coffee b/packages/server/test/unit/background/preprocessor_spec.coffee
index f257e9e1d71d..b06208b920de 100644
--- a/packages/server/test/unit/background/preprocessor_spec.coffee
+++ b/packages/server/test/unit/background/preprocessor_spec.coffee
@@ -22,8 +22,8 @@ describe "lib/background/preprocessor", ->
     @testPath = path.join(@todosPath, "test.coffee")
     @localPreprocessorPath = path.join(@todosPath, "prep.coffee")
 
-    @plugin = sinon.stub().returns("/path/to/output.js")
-    background.register("browser:filePreprocessor", @plugin)
+    sinon.stub(background, "execute").resolves("/path/to/output.js")
+    sinon.stub(background, "isRegistered").returns(true)
 
     preprocessor.close()
 
@@ -35,18 +35,18 @@ describe "lib/background/preprocessor", ->
   context "#getFile", ->
     it "executes the plugin with file path", ->
       preprocessor.getFile(@filePath, @config)
-      expect(@plugin).to.be.called
-      expect(@plugin.lastCall.args[0].filePath).to.equal(@fullFilePath)
+      expect(background.execute).to.be.calledWith("browser:filePreprocessor")
+      expect(background.execute.lastCall.args[1].filePath).to.equal(@fullFilePath)
 
     it "executes the plugin with output path", ->
       preprocessor.getFile(@filePath, @config)
       expectedPath = appData.projectsPath(toHashName(@todosPath), "bundles", @filePath)
-      expect(@plugin.lastCall.args[0].outputPath).to.equal(expectedPath)
+      expect(background.execute.lastCall.args[1].outputPath).to.equal(expectedPath)
 
     it "executes the plugin with output path when integrationFolder was defined", ->
       preprocessor.getFile(@integrationFolder + @filePath, Object.assign({integrationFolder: @integrationFolder}, @config))
       expectedPath = appData.projectsPath(toHashName(@todosPath), "bundles", @filePath)
-      expect(@plugin.lastCall.args[0].outputPath).to.equal(expectedPath)
+      expect(background.execute.lastCall.args[1].outputPath).to.equal(expectedPath)
 
     it "returns a promise resolved with the plugin's outputPath", ->
       preprocessor.getFile(@filePath, @config).then (filePath) ->
@@ -56,37 +56,39 @@ describe "lib/background/preprocessor", ->
       fileUpdated = sinon.spy()
       preprocessor.emitter.on("file:updated", fileUpdated)
       preprocessor.getFile(@filePath, @config)
-      @plugin.lastCall.args[0].emit("rerun")
+      background.execute.lastCall.args[1].emit("rerun")
       expect(fileUpdated).to.be.calledWith(@fullFilePath)
 
-    it "invokes plugin again when isTextTerminal: false", ->
+    it "executes plugin again when isTextTerminal: false", ->
       @config.isTextTerminal = false
       preprocessor.getFile(@filePath, @config)
       preprocessor.getFile(@filePath, @config)
-      expect(@plugin).to.be.calledTwice
+      expect(background.execute).to.be.calledTwice
 
-    it "does not invoke plugin again when isTextTerminal: true", ->
+    it "does not execute plugin again when isTextTerminal: true", ->
       @config.isTextTerminal = true
       preprocessor.getFile(@filePath, @config)
       preprocessor.getFile(@filePath, @config)
-      expect(@plugin).to.be.calledOnce
+      expect(background.execute).to.be.calledOnce
 
     it "uses default preprocessor if none registered", ->
       background._reset()
-      sinon.stub(background, "register")
-      sinon.stub(background, "execute").returns(->)
-      browserifyFn = ->
-      browserify = sinon.stub().returns(browserifyFn)
-      mockery.registerMock("@cypress/browserify-preprocessor", browserify)
+      background.isRegistered.returns(false)
+      browserify = sinon.stub()
+      browserifyMock = sinon.stub().returns(browserify)
+      mockery.registerMock("@cypress/browserify-preprocessor", browserifyMock)
       preprocessor.getFile(@filePath, @config)
-      expect(background.register).to.be.calledWith("browser:filePreprocessor", browserifyFn)
+      expect(browserifyMock).to.be.called
       expect(browserify).to.be.called
+      expect(browserify.lastCall.args[0].filePath).to.include("path/to/test.coffee")
+      expect(browserify.lastCall.args[0].outputPath).to.include("bundles/path/to/test.coffee")
+      expect(background.execute).not.to.be.called
 
   context "#removeFile", ->
     it "emits 'close'", ->
       preprocessor.getFile(@filePath, @config)
       onClose = sinon.spy()
-      @plugin.lastCall.args[0].on("close", onClose)
+      background.execute.lastCall.args[1].on("close", onClose)
       preprocessor.removeFile(@filePath, @config)
       expect(onClose).to.be.called
 
@@ -101,7 +103,7 @@ describe "lib/background/preprocessor", ->
     it "emits 'close' on config emitter", ->
       preprocessor.getFile(@filePath, @config)
       onClose = sinon.spy()
-      @plugin.lastCall.args[0].on("close", onClose)
+      background.execute.lastCall.args[1].on("close", onClose)
       preprocessor.close()
       expect(onClose).to.be.called
 
diff --git a/packages/server/test/unit/gui/events_spec.coffee b/packages/server/test/unit/gui/events_spec.coffee
index 097475ed5c7c..8c3a1c064e12 100644
--- a/packages/server/test/unit/gui/events_spec.coffee
+++ b/packages/server/test/unit/gui/events_spec.coffee
@@ -24,7 +24,9 @@ konfig   = require("#{root}../lib/konfig")
 describe "lib/gui/events", ->
   beforeEach ->
     @send    = sinon.spy()
-    @options = {}
+    @options = {
+      projectRoot: "/path/to/project/root"
+    }
     @cookies = sinon.stub({
       get: ->
       set: ->
@@ -683,3 +685,28 @@ describe "lib/gui/events", ->
           expect(err.name).to.equal("ECONNREFUSED 127.0.0.1:1234")
           expect(err.message).to.equal("ECONNREFUSED 127.0.0.1:1234")
           expect(err.apiUrl).to.equal(konfig("api_url"))
+
+    describe "launch:browser", ->
+      beforeEach ->
+        @result = {}
+        @optoins = { browser: "chrome", spec: "/path/to/spec.js" }
+        sinon.stub(openProject, "launchBrowser").resolves(@result)
+
+      it "launches the browser", ->
+        @handleEvent("launch:browser", @options)
+        .then (assert) =>
+          expect(openProject.launchBrowser).to.be.calledWith(@options.browser, @options.spec)
+          expect(openProject.launchBrowser.lastCall.args[2].projectRoot).to.equal(@options.projectRoot)
+          assert.sendCalledWith(@result)
+
+      it "emits 'browser:close' onBrowserClose", (done) ->
+        @handleEvent("launch:browser", @options)
+        .then (assert) =>
+          @bus.on "browser:close", -> done()
+          openProject.launchBrowser.lastCall.args[2].onBrowserClose()
+
+    describe "await:browser:close", ->
+      it "calls openProject.specEnd", ->
+        sinon.stub(openProject, "specEnd").resolves()
+        @handleEvent("await:browser:close").then ->
+          expect(openProject.specEnd).to.be.called
diff --git a/packages/server/test/unit/modes/run_spec.coffee b/packages/server/test/unit/modes/run_spec.coffee
index 5ee93bd37258..3ae891678e0a 100644
--- a/packages/server/test/unit/modes/run_spec.coffee
+++ b/packages/server/test/unit/modes/run_spec.coffee
@@ -15,9 +15,11 @@ env = require("#{root}../lib/util/env")
 random = require("#{root}../lib/util/random")
 system = require("#{root}../lib/util/system")
 specsUtil = require("#{root}../lib/util/specs")
+background = require("#{root}../lib/background")
 
 describe "lib/modes/run", ->
   beforeEach ->
+    sinon.stub(background, "execute").resolves()
     @projectInstance = Project("/_test-output/path/to/project")
 
   context ".getProjectId", ->
@@ -132,7 +134,7 @@ describe "lib/modes/run", ->
 
   context ".launchBrowser", ->
     beforeEach ->
-      @launch = sinon.stub(openProject, "launch")
+      @launch = sinon.stub(openProject, "launchBrowser")
       sinon.stub(runMode, "getElectronProps").returns({foo: "bar"})
       sinon.stub(runMode, "screenshotMetadata").returns({a: "a"})
 
@@ -477,7 +479,7 @@ describe "lib/modes/run", ->
       })
       sinon.spy(runMode,  "waitForBrowserToConnect")
       sinon.stub(videoCapture, "start").resolves()
-      sinon.stub(openProject, "launch").resolves()
+      sinon.stub(openProject, "launchBrowser").resolves()
       sinon.stub(openProject, "getProject").resolves(@projectInstance)
       sinon.spy(errors, "warning")
       sinon.stub(config, "get").resolves({
@@ -545,7 +547,7 @@ describe "lib/modes/run", ->
       })
       sinon.spy(runMode,  "waitForBrowserToConnect")
       sinon.spy(runMode,  "runSpecs")
-      sinon.stub(openProject, "launch").resolves()
+      sinon.stub(openProject, "launchBrowser").resolves()
       sinon.stub(openProject, "getProject").resolves(@projectInstance)
       sinon.stub(specsUtil, "find").resolves([
         {
@@ -587,14 +589,14 @@ describe "lib/modes/run", ->
           project: @projectInstance
         })
 
-    it "passes headed to openProject.launch", ->
+    it "passes headed to openProject.launchBrowser", ->
       browser = { name: "electron" }
 
       browsers.ensureAndGetByName.resolves(browser)
 
       runMode.run({ headed: true })
       .then ->
-        expect(openProject.launch).to.be.calledWithMatch(
+        expect(openProject.launchBrowser).to.be.calledWithMatch(
           browser,
           {
             name: "foo_spec.js"
diff --git a/packages/server/test/unit/open_project_spec.coffee b/packages/server/test/unit/open_project_spec.coffee
index d3e608238c86..d206612186ec 100644
--- a/packages/server/test/unit/open_project_spec.coffee
+++ b/packages/server/test/unit/open_project_spec.coffee
@@ -4,6 +4,7 @@ browsers = require("#{root}lib/browsers")
 Project = require("#{root}lib/project")
 openProject = require("#{root}lib/open_project")
 preprocessor = require("#{root}lib/background/preprocessor")
+serverEvents = require("#{root}lib/background/server_events")
 
 describe "lib/open_project", ->
   beforeEach ->
@@ -11,6 +12,8 @@ describe "lib/open_project", ->
       reset: sinon.stub()
       use: sinon.stub()
     }
+    @spec = { absolute: "path/to/spec" }
+    @browser = { name: "chrome" }
 
     sinon.stub(browsers, "get").resolves()
     sinon.stub(browsers, "open")
@@ -23,22 +26,15 @@ describe "lib/open_project", ->
 
     openProject.create("/project/root")
 
-  context "#launch", ->
-    beforeEach ->
-      @spec = {
-        absolute: "path/to/spec"
-      }
-
-      @browser = { name: "chrome" }
-
+  context "#launchBrowser", ->
     it "tells preprocessor to remove file on browser close", ->
-      openProject.launch(@browser, @spec)
+      openProject.launchBrowser(@browser, @spec)
       .then ->
         browsers.open.lastCall.args[1].onBrowserClose()
         expect(preprocessor.removeFile).to.be.calledWith("path/to/spec")
 
     it "does not tell preprocessor to remove file if no spec", ->
-      openProject.launch(@browser, {})
+      openProject.launchBrowser(@browser, {})
       .then ->
         browsers.open.lastCall.args[1].onBrowserClose()
         expect(preprocessor.removeFile).not.to.be.called
@@ -46,13 +42,13 @@ describe "lib/open_project", ->
     it "runs original onBrowserClose callback on browser close", ->
       onBrowserClose = sinon.stub()
       options = { onBrowserClose }
-      openProject.launch(@browser, @spec, options)
+      openProject.launchBrowser(@browser, @spec, options)
       .then ->
         browsers.open.lastCall.args[1].onBrowserClose()
         expect(onBrowserClose).to.be.called
 
     it "calls project.reset on launch", ->
-      openProject.launch(@browser, @spec)
+      openProject.launchBrowser(@browser, @spec)
       .then ->
         expect(Project.prototype.reset).to.be.called
 
@@ -60,7 +56,67 @@ describe "lib/open_project", ->
       expect(@browser.isHeaded).to.be.undefined
       expect(@browser.isHeadless).to.be.undefined
 
-      openProject.launch(@browser, @spec)
+      openProject.launchBrowser(@browser, @spec)
       .then =>
         expect(@browser.isHeaded).to.be.true
         expect(@browser.isHeadless).to.be.false
+
+    it "executes 'spec:start' event if in interactive mode", ->
+      openProject.create("/project/root", {}, { isTextTerminal: false })
+      sinon.stub(serverEvents, "execute")
+
+      openProject.launchBrowser(@browser, @spec).then ->
+        expect(serverEvents.execute).to.be.calledWith("spec:start")
+
+    it "does not execute 'spec:start' event if in run mode", ->
+      openProject.create("/project/root", {}, { isTextTerminal: true })
+      sinon.stub(serverEvents, "execute")
+
+      openProject.launchBrowser(@browser, @spec).then ->
+        expect(serverEvents.execute).not.to.be.called
+
+  context "#closeBrowser", ->
+    beforeEach ->
+      sinon.stub(browsers, "close").resolves()
+
+    it "closes the browser", ->
+      openProject.closeBrowser().then ->
+        expect(browsers.close).to.be.called
+
+    it "executes 'spec:end' event the spec if in interactive mode", ->
+      openProject.create("/project/root", {}, { isTextTerminal: false })
+      sinon.stub(serverEvents, "execute")
+
+      openProject.launchBrowser(@browser, @spec)
+      .then ->
+        openProject.closeBrowser()
+      .then =>
+        expect(serverEvents.execute).to.be.calledWith("spec:end", @spec)
+
+    it "does not execute 'spec:end' event if project not open", ->
+      openProject.__reset()
+      sinon.stub(serverEvents, "execute")
+
+      openProject.closeBrowser().then ->
+        expect(serverEvents.execute).not.to.be.called
+
+    it "does not execute 'spec:end' event if in run mode", ->
+      openProject.create("/project/root", {}, { isTextTerminal: true })
+      sinon.stub(serverEvents, "execute")
+
+      openProject.closeBrowser().then ->
+        expect(serverEvents.execute).not.to.be.called
+
+  context.only "#close", ->
+    it "closes the project if it is open", ->
+      project = openProject.getProject()
+      sinon.stub(project, "close")
+      openProject.close().then ->
+        expect(project.close).to.be.called
+
+    it "does not close the project if it is not open", ->
+      project = openProject.getProject()
+      sinon.stub(project, "close")
+      openProject.__reset()
+      openProject.close().then ->
+        expect(project.close).not.to.be.called
diff --git a/packages/server/test/unit/project_spec.coffee b/packages/server/test/unit/project_spec.coffee
index be18eabdb685..69e2401cbcb0 100644
--- a/packages/server/test/unit/project_spec.coffee
+++ b/packages/server/test/unit/project_spec.coffee
@@ -18,6 +18,8 @@ preprocessor = require("#{root}lib/background/preprocessor")
 background   = require("#{root}lib/background")
 fs           = require("#{root}lib/util/fs")
 settings     = require("#{root}lib/util/settings")
+serverEvents = require("#{root}lib/background/server_events")
+browsers     = require("#{root}lib/browsers")
 
 describe "lib/project", ->
   beforeEach ->
@@ -211,6 +213,38 @@ describe "lib/project", ->
         expect(@project.saveState).to.be.calledWith({ autoScrollingEnabled: false})
         expect(config.state).to.eql({ autoScrollingEnabled: false })
 
+    it "executes 'run:start' event if in interactive mode", ->
+      sinon.stub(serverEvents, "execute")
+      @project.isTextTerminal = false
+
+      @project.open({}).then ->
+        expect(serverEvents.execute).to.be.calledWith("run:start")
+
+    it "does not execute 'run:start' event if in run mode", ->
+      sinon.stub(serverEvents, "execute")
+      @project.isTextTerminal = true
+
+      @project.open({}).then ->
+        expect(serverEvents.execute).not.to.be.called
+
+    it "closes the browser and re-throws the error when the background fails to initialize", ->
+      sinon.stub(browsers, "close")
+      background.init.rejects(new Error("foo"))
+
+      @project.open({}).catch (err) ->
+        expect(browsers.close).to.be.called
+        expect(err.message).to.include("foo")
+
+    it "closes the browser and calls options.onError when the background has unexpected error", ->
+      sinon.stub(browsers, "close")
+
+      onError = sinon.spy()
+      @project.open({ onError }).then ->
+        err = {}
+        background.init.lastCall.args[1].onError(err)
+        expect(browsers.close).to.be.called
+        expect(onError).to.be.calledWith(err)
+
     it.skip "watches cypress.json", ->
       @server.open().bind(@).then ->
         expect(Watchers::watch).to.be.calledWith("/Users/brian/app/cypress.json")
@@ -245,6 +279,20 @@ describe "lib/project", ->
     it "can close when server + watchers arent open", ->
       @project.close()
 
+    it "executes 'run:end' event if in interactive mode", ->
+      sinon.stub(serverEvents, "execute")
+      @project.isTextTerminal = false
+
+      @project.close().then ->
+        expect(serverEvents.execute).to.be.calledWith("run:end")
+
+    it "does not execute 'run:end' event if in run mode", ->
+      sinon.stub(serverEvents, "execute")
+      @project.isTextTerminal = true
+
+      @project.close().then ->
+        expect(serverEvents.execute).not.to.be.called
+
   context "#reset", ->
     beforeEach ->
       @project = Project(@pristinePath)