diff --git a/circle.yml b/circle.yml
index ca875d9fe619..b6ed14a9ee54 100644
--- a/circle.yml
+++ b/circle.yml
@@ -406,9 +406,9 @@ jobs:
       - store_test_results:
           path: /tmp/cypress
 
-  "driver-integration-tests-3x":
+  "driver-integration-tests-chrome":
     <<: *defaults
-    parallelism: 3
+    parallelism: 5
     steps:
       - attach_workspace:
           at: ~/
@@ -423,7 +423,31 @@ jobs:
           command: |
             CYPRESS_KONFIG_ENV=production \
             CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
-            npm run cypress:run -- --record --parallel --group 3x-driver-chrome --browser chrome
+            npm run cypress:run -- --record --parallel --group 5x-driver-chrome --browser chrome
+          working_directory: packages/driver
+      - store_test_results:
+          path: /tmp/cypress
+      - store_artifacts:
+          path: /tmp/artifacts
+
+  "driver-integration-tests-electron":
+    <<: *defaults
+    parallelism: 5
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          command: npm start
+          background: true
+          working_directory: packages/driver
+      - run:
+          command: $(npm bin)/wait-on http://localhost:3500
+          working_directory: packages/driver
+      - run:
+          command: |
+            CYPRESS_KONFIG_ENV=production \
+            CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
+            npm run cypress:run -- --record --parallel --group 5x-driver-electron --browser electron
           working_directory: packages/driver
       - store_test_results:
           path: /tmp/cypress
@@ -796,7 +820,11 @@ linux-workflow: &linux-workflow
     - server-e2e-tests-8:
         requires:
           - build
-    - driver-integration-tests-3x:
+    - driver-integration-tests-chrome:
+        context: test-runner:integration-tests
+        requires:
+          - build
+    - driver-integration-tests-electron:
         context: test-runner:integration-tests
         requires:
           - build
diff --git a/packages/driver/test/cypress/integration/commands/clock_spec.coffee b/packages/driver/test/cypress/integration/commands/clock_spec.coffee
index fac42ee4020c..142ac45c31ca 100644
--- a/packages/driver/test/cypress/integration/commands/clock_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/clock_spec.coffee
@@ -77,13 +77,11 @@ describe "src/cy/commands/clock", ->
       .then (clock) ->
         cy.window().then (win) ->
           expect(win.performance.getEntriesByType("paint")).to.deep.eq([])
-          expect(win.performance.getEntriesByName("first-paint")).to.deep.eq([])
           expect(win.performance.getEntries()).to.deep.eq([])
 
           clock.restore()
 
           expect(win.performance.getEntriesByType("paint").length).to.be.at.least(1)
-          expect(win.performance.getEntriesByName("first-paint").length).to.be.at.least(1)
           expect(win.performance.getEntries().length).to.be.at.least(1)
 
     context "errors", ->
diff --git a/packages/driver/test/cypress/integration/commands/navigation_spec.coffee b/packages/driver/test/cypress/integration/commands/navigation_spec.coffee
index 72e0d49976ee..315b411aa8d3 100644
--- a/packages/driver/test/cypress/integration/commands/navigation_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/navigation_spec.coffee
@@ -362,19 +362,19 @@ describe "src/cy/commands/navigation", ->
 
     describe ".log", ->
       beforeEach ->
-        @logs = []
+        cy.visit("/fixtures/generic.html").then ->
+          @logs = []
 
-        cy.on "log:added", (attrs, log) =>
-          if attrs.name is "go"
-            @lastLog = log
+          cy.on "log:added", (attrs, log) =>
+            if attrs.name is "go"
+              @lastLog = log
 
-          @logs.push(log)
+            @logs.push(log)
 
-        return null
+          return null
 
       it "logs go", ->
         cy
-          .visit("/fixtures/generic.html")
           .visit("/fixtures/jquery.html")
           .go("back").then ->
             lastLog = @lastLog
@@ -384,14 +384,12 @@ describe "src/cy/commands/navigation", ->
 
       it "can turn off logging", ->
         cy
-          .visit("/fixtures/generic.html")
           .visit("/fixtures/jquery.html")
           .go("back", {log: false}).then ->
             expect(@lastLog).to.be.undefined
 
       it "does not log 'Page Load' events", ->
         cy
-          .visit("/fixtures/generic.html")
           .visit("/fixtures/jquery.html")
           .go("back").then ->
             @logs.slice(0).forEach (log) ->
@@ -401,7 +399,6 @@ describe "src/cy/commands/navigation", ->
         beforeunload = false
 
         cy
-          .visit("/fixtures/generic.html")
           .visit("/fixtures/jquery.html")
           .window().then (win) ->
             cy.on "window:before:unload", =>