diff --git a/mock-dev.js b/mock-dev.js
index 99aec9a65..84f2d234a 100644
--- a/mock-dev.js
+++ b/mock-dev.js
@@ -26,7 +26,7 @@ const extension = require('./development/mockExtension')
 // Query String
 const qs = require('qs')
 let queryString = qs.parse(window.location.href.split('#')[1])
-let selectedView = queryString.view || 'terms'
+let selectedView = queryString.view || 'first time'
 const firstState = states[selectedView]
 updateQueryParams(selectedView)
 
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 7cabf1f0a..a73b0cba3 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -1,23 +1,15 @@
 QUnit.test('agree to terms', function (assert) {
   var done = assert.async()
+  let app
 
-  // Select the mock app root
-  var app = $('iframe').contents().find('#app-content .mock-app-root')
-
-  app.find('.markdown').prop('scrollTop', 100000000)
   wait().then(function() {
-    app.find('button').click()
-  }).then(function() {
+    app = $('iframe').contents().find('#app-content .mock-app-root')
+    app.find('.markdown').prop('scrollTop', 100000000)
     return wait()
   }).then(function() {
     var title = app.find('h1').text()
     assert.equal(title, 'MetaMask', 'title screen')
 
-    var buttons = app.find('button')
-    assert.equal(buttons.length, 1, 'one button: create new vault')
-
     done()
   })
-
-  // Wait for view to transition:
 })
diff --git a/ui-dev.js b/ui-dev.js
index e48122970..e39340859 100644
--- a/ui-dev.js
+++ b/ui-dev.js
@@ -25,7 +25,7 @@ const Selector = require('./development/selector')
 // Query String
 const qs = require('qs')
 let queryString = qs.parse(window.location.href.split('#')[1])
-let selectedView = queryString.view || 'account detail'
+let selectedView = queryString.view || 'first time'
 const firstState = states[selectedView]
 updateQueryParams(selectedView)