diff --git a/test/fixtures/__tests__/scenarioManager.js b/test/fixtures/__tests__/scenarioManager.js
index 8d93d9d65017..3c8d261c4c85 100644
--- a/test/fixtures/__tests__/scenarioManager.js
+++ b/test/fixtures/__tests__/scenarioManager.js
@@ -84,7 +84,7 @@ describe('scenario manager', function () {
     });
 
 
-    it('should load if the index is empty', function () {
+    it('should not load if the index is not empty', function () {
       var load = sinon.stub(manager, 'load', Promise.resolve);
       var returnOne = sinon.stub(manager.client, 'count', function () {
         return Promise.resolve({
diff --git a/test/functional/apps/settings/_initial_state.js b/test/functional/apps/settings/_initial_state.js
new file mode 100644
index 000000000000..d8a8815e9e85
--- /dev/null
+++ b/test/functional/apps/settings/_initial_state.js
@@ -0,0 +1,41 @@
+define(function () {
+  return function (bdd, expect, common, settingsPage) {
+    console.log(arguments);
+    return function () {
+      bdd.it('something', function () {
+        var testSubName = 'testSettingsInitialState';
+        common.log('we have common stuff');
+        return settingsPage.getTimeBasedEventsCheckbox().isSelected()
+        .then(function (selected) {
+          expect(selected).to.be.ok();
+        })
+        .then(function () {
+          return settingsPage.getNameIsPatternCheckbox().isSelected()
+          .then(function (nameIsPatternSelected) {
+            expect(nameIsPatternSelected).to.not.be.ok();
+          });
+        })
+        .then(function () {
+          return settingsPage.getIndexPatternField()
+          .then(function (patternField) {
+            return patternField.getProperty('value')
+            .then(function (pattern) {
+              common.log('patternField value = ' + pattern);
+              expect(pattern).to.be('logstash-*');
+            });
+          });
+        })
+        .then(function () {
+          return settingsPage.getTimeFieldNameField().isSelected()
+          .then(function (timeFieldIsSelected) {
+            common.log('timeField isSelected = ' + timeFieldIsSelected);
+            expect(timeFieldIsSelected).to.not.be.ok();
+          });
+        })
+        .catch(function screenshotError(reason) {
+          return common.screenshotError(testSubName, reason);
+        });
+      });
+    };
+  };
+});
diff --git a/test/functional/apps/settings/testSettings.js b/test/functional/apps/settings/testSettings.js
new file mode 100644
index 000000000000..d11922633643
--- /dev/null
+++ b/test/functional/apps/settings/testSettings.js
@@ -0,0 +1,75 @@
+define(function (require) {
+  var bdd = require('intern!bdd');
+  var expect = require('intern/dojo/node!expect.js');
+  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenarioManager');
+  var pollUntil = require('intern/dojo/node!leadfoot/helpers/pollUntil');
+  var Common = require('../../../support/pages/Common');
+  var SettingsPage = require('../../../support/pages/SettingsPage');
+  var HeaderPage = require('../../../support/pages/HeaderPage');
+  var config = require('intern').config;
+  var url = require('intern/dojo/node!url');
+  var _ = require('intern/dojo/node!lodash');
+  var initialStateTest = require('./_initial_state');
+
+  bdd.describe('settings app', function () {
+    var common;
+    var settingsPage;
+    var headerPage;
+    var scenarioManager;
+    var remote;
+
+    var expectedAlertText = 'Are you sure you want to remove this index pattern?';
+    // on setup, we create an settingsPage instance
+    // that we will use for all the tests
+    bdd.before(function () {
+      common = new Common(this.remote);
+      settingsPage = new SettingsPage(this.remote);
+      common.log('running bdd.before');
+      headerPage = new HeaderPage(this.remote);
+      scenarioManager = new ScenarioManager(url.format(config.elasticsearch));
+      remote = this.remote;
+      console.log('common = ', common);
+    });
+
+    bdd.beforeEach(function () {
+
+      // start each test with an empty kibana index
+      return scenarioManager.reload('emptyKibana')
+      // and load a minimal set of makelogs data
+      .then(function loadIfEmptyMakelogs() {
+        return scenarioManager.loadIfEmpty('makelogs');
+      })
+      .then(function () {
+        return common.sleep(2500);
+      })
+      .then(function () {
+        return common.tryForTime(25000, function () {
+          return remote.get(url.format(_.assign(config.kibana, {
+            pathname: ''
+          })))
+          .then(function () {
+            return common.sleep(2000);
+          })
+          .then(function () {
+            return remote.getCurrentUrl()
+            .then(function (currentUrl) {
+              expect(currentUrl).to.contain('settings');
+            });
+          });
+        });
+      });
+    });
+
+    bdd.after(function unloadMakelogs() {
+      return scenarioManager.unload('makelogs');
+    });
+
+    /*
+     ** Test the default state of checboxes and the 2 text input fields
+     */
+    bdd.describe('initial state', function () {
+      initialStateTest(bdd, expect, common, settingsPage);
+    });
+
+  });
+});
diff --git a/test/functional/status.js b/test/functional/status.js
deleted file mode 100644
index 2ab69ecc144c..000000000000
--- a/test/functional/status.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  var registerSuite = require('intern!object');
-  var expect = require('intern/dojo/node!expect.js');
-  var config = require('intern').config;
-  var getUrl = require('intern/dojo/node!../utils/getUrl');
-
-  registerSuite(function () {
-    return {
-      status: function () {
-        return this.remote
-          .get(getUrl(config.kibana, 'status'))
-          .setFindTimeout(60000)
-          .findByCssSelector('.plugin_status_breakdown')
-          .getVisibleText()
-          .then(function (text) {
-            expect(text.indexOf('plugin:kibana Ready')).to.be.above(-1);
-          });
-      }
-    };
-  });
-});
diff --git a/test/functional/testSettings.js b/test/functional/testSettings.js
deleted file mode 100644
index 4b809a869c79..000000000000
--- a/test/functional/testSettings.js
+++ /dev/null
@@ -1,590 +0,0 @@
-define(function (require) {
-
-  var registerSuite = require('intern!object');
-  var expect = require('intern/dojo/node!expect.js');
-  var ScenarioManager = require('intern/dojo/node!../fixtures/scenarioManager');
-  var pollUntil = require('intern/dojo/node!leadfoot/helpers/pollUntil');
-  var Common = require('../support/pages/Common');
-  var SettingsPage = require('../support/pages/SettingsPage');
-  var HeaderPage = require('../support/pages/HeaderPage');
-  var config = require('intern').config;
-  var url = require('intern/dojo/node!url');
-  var _ = require('intern/dojo/node!lodash');
-
-
-  registerSuite(function () {
-    var common;
-    var settingsPage;
-    var headerPage;
-    var scenarioManager;
-    var remote;
-
-    var expectedAlertText = 'Are you sure you want to remove this index pattern?';
-    return {
-      // on setup, we create an settingsPage instance
-      // that we will use for all the tests
-      setup: function () {
-        common = new Common(this.remote);
-        settingsPage = new SettingsPage(this.remote);
-        headerPage = new HeaderPage(this.remote);
-        scenarioManager = new ScenarioManager(url.format(config.elasticsearch));
-        remote = this.remote;
-      },
-
-      beforeEach: function () {
-
-        // start each test with an empty kibana index
-        return scenarioManager.reload('emptyKibana')
-        // and load a minimal set of makelogs data
-        .then(function loadIfEmptyMakelogs() {
-          return scenarioManager.loadIfEmpty('makelogs');
-        })
-        .then(function () {
-          return common.sleep(2500);
-        })
-        .then(function () {
-          return common.tryForTime(25000, function () {
-            return remote.get(url.format(_.assign(config.kibana, {
-              pathname: ''
-            })))
-            .then(function () {
-              return common.sleep(2000);
-            })
-            .then(function () {
-              return remote.getCurrentUrl()
-              .then(function (currentUrl) {
-                expect(currentUrl).to.contain('settings');
-              });
-            });
-          });
-        });
-      },
-
-      teardown: function unloadMakelogs() {
-        return scenarioManager.unload('makelogs');
-      },
-
-      /*
-       ** Test the default state of checboxes and the 2 text input fields
-       */
-      testSettingsInitialState: function () {
-        var testSubName = 'testSettingsInitialState';
-
-        return settingsPage.getTimeBasedEventsCheckbox().isSelected()
-        .then(function (selected) {
-          expect(selected).to.be.ok();
-        })
-        .then(function () {
-          return settingsPage.getNameIsPatternCheckbox().isSelected()
-          .then(function (nameIsPatternSelected) {
-            expect(nameIsPatternSelected).to.not.be.ok();
-          });
-        })
-        .then(function () {
-          return settingsPage.getIndexPatternField()
-          .then(function (patternField) {
-            return patternField.getProperty('value')
-            .then(function (pattern) {
-              common.log('patternField value = ' + pattern);
-              expect(pattern).to.be('logstash-*');
-            });
-          });
-        })
-        .then(function () {
-          return settingsPage.getTimeFieldNameField().isSelected()
-          .then(function (timeFieldIsSelected) {
-            common.log('timeField isSelected = ' + timeFieldIsSelected);
-            expect(timeFieldIsSelected).to.not.be.ok();
-          });
-        })
-        .catch(function screenshotError(reason) {
-          return common.screenshotError(testSubName, reason);
-        });
-      },
-
-      /*
-       ** Ensure Create button is disabled until you select a time field
-       */
-      testCreateButtonDisabledUntilTimeFieldSelected: function () {
-        var testSubName = 'testCreateButtonDisabledUntilTimeFieldSelected';
-
-        return settingsPage.getCreateButton().isEnabled()
-        .then(function (enabled) {
-          expect(enabled).to.not.be.ok();
-        })
-        .then(function () {
-          // select a time field and check that Create button is enabled
-          return settingsPage
-          .selectTimeFieldOption('@timestamp');
-        })
-        .then(function () {
-          return settingsPage.getCreateButton().isEnabled()
-          .then(function (enabled) {
-            expect(enabled).to.be.ok();
-          });
-        })
-        .catch(function screenshotError(reason) {
-          return common.screenshotError(testSubName, reason);
-        });
-      },
-
-
-      /*
-       ** Test that unchecking the Time-based Events checkbox hides the Name is pattern checkbox
-       */
-      testSettingsCheckboxHide: function () {
-        var testSubName = 'testSettingsCheckboxHide';
-
-        return settingsPage.getTimeBasedEventsCheckbox()
-        .then(function (selected) {
-          // uncheck the 'time-based events' checkbox
-          return selected.click();
-        })
-        // try to find the name is pattern checkbox (shouldn't find it)
-        .then(function () {
-          return settingsPage.getNameIsPatternCheckbox();
-        })
-        .then(function (selected1) {
-          expect(
-            true, false, 'Did not expect to find the Name is Pattern checkbox when the TimeBasedEvents checkbox is unchecked'
-          );
-        })
-        .catch(function (reason) {
-          // it's OK.  We expected not to find the getNameIsPatternCheckbox.
-          return;
-        });
-      },
-      // Index pattern field list
-
-      testCreateRemoveIndexPattern: function () {
-        var testSubName = 'testCreateRemoveIndexPattern';
-
-        // select a time field and then Create button
-        return settingsPage.selectTimeFieldOption('@timestamp')
-        .then(function () {
-          return settingsPage.getCreateButton().click();
-        })
-        .then(function () {
-          return settingsPage.getIndexPageHeading()
-          .then(function (getIndexPageHeading) {
-            common.log(getIndexPageHeading.getVisibleText());
-          })
-          .then(function () {
-            // delete the index pattern
-            return common.tryForTime(3000, function () {
-              return settingsPage.clickDeletePattern();
-            });
-          })
-          .then(function () {
-            return common.tryForTime(3000, function () {
-              return remote.getAlertText();
-            });
-          })
-          .then(function () {
-            return remote.acceptAlert();
-          })
-          // getting the current URL which shows 'logstash-*' pattern
-          .then(function () {
-            return remote.getCurrentUrl()
-            .then(function (currentUrl) {
-              common.log('currentUrl = ' + currentUrl);
-            });
-          })
-          // pollUntil we find the Create button
-          .then(pollUntil(function (value) {
-            var element = document.getElementsByClassName('btn-success')[0];
-            return element ? element : null;
-          }, ['Configure an index pattern'], 8000))
-          .then(function () {
-            common.log('success');
-          })
-          // getting the current URL which no longer includes 'logstash-*'
-          .then(function () {
-            return remote.getCurrentUrl()
-            .then(function (currentUrl) {
-              common.log('currentUrl = ' + currentUrl);
-            });
-          });
-        })
-        .catch(function screenshotError(reason) {
-          return common.screenshotError(testSubName, reason);
-        });
-      },
-
-      testIndexPatternResultsHeader: function () {
-        var testSubName = 'testIndexPatternResultsHeader';
-
-        return settingsPage.selectTimeFieldOption('@timestamp')
-        .then(function () {
-          return settingsPage.getCreateButton().click();
-        })
-        .then(function () {
-          return settingsPage.getIndexPageHeading()
-          .then(function (getIndexPageHeading) {
-            return getIndexPageHeading.getVisibleText()
-            .then(function (pageText) {
-              expect(pageText).to.be('logstash-*');
-            });
-          });
-        })
-        .then(function () {
-          return settingsPage.getTableHeader()
-          .then(function (header) {
-            common.log('header.length = ' + header.length); // 6 name   type  format  analyzed  indexed   controls
-            expect(header.length).to.be(6);
-            return header[0].getVisibleText()
-            .then(function (text) {
-              common.log('header[0] = ' + text); // name
-              expect(text).to.be('name');
-              return header;
-            });
-          })
-          .then(function (header) {
-            return header[1].getVisibleText()
-            .then(function (text) {
-              common.log('header[1] = ' + text);
-              expect(text).to.be('type');
-              return header;
-            });
-          })
-          .then(function (header) {
-            return header[2].getVisibleText()
-            .then(function (text) {
-              common.log('header[2] = ' + text);
-              expect(text).to.be('format');
-              return header;
-            });
-          })
-          .then(function (header) {
-            return header[3].getVisibleText()
-            .then(function (text) {
-              common.log('header[3] = ' + text);
-              expect(text).to.be('analyzed');
-              return header;
-            });
-          })
-          .then(function (header) {
-            return header[4].getVisibleText()
-            .then(function (text) {
-              common.log('header[4] = ' + text);
-              expect(text).to.be('indexed');
-              return header;
-            });
-          })
-          .then(function (header) {
-            return header[5].getVisibleText()
-            .then(function (text) {
-              common.log('header[5] = ' + text);
-              expect(text).to.be('controls');
-              return header;
-            });
-          })
-          .then(function () {
-            return common.tryForTime(3000, function () {
-              // delete the index pattern -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X
-              return settingsPage.clickDeletePattern();
-            });
-          })
-          .then(function () {
-            return common.tryForTime(3000, function () {
-              return remote.getAlertText();
-            });
-          })
-          .then(function () {
-            return remote.getAlertText()
-            .then(function (alertText) {
-              common.log('alertText = ' + alertText);
-              expect(alertText).to.be(expectedAlertText);
-            });
-          })
-          .then(function () {
-            return remote.acceptAlert();
-          });
-        })
-        .catch(function screenshotError(reason) {
-          return common.screenshotError(testSubName, reason);
-        });
-      },
-
-
-      testIndexPatternResultsSort: function () {
-        var testSubName = 'testIndexPatternResultsSort';
-
-        return settingsPage.selectTimeFieldOption('@timestamp')
-        .then(function () {
-          return settingsPage.getCreateButton().click();
-        })
-        // check the page header to make sure we see logstash-*
-        .then(function () {
-          return settingsPage.getIndexPageHeading()
-          .then(function (getIndexPageHeading) {
-            return getIndexPageHeading.getVisibleText()
-            .then(function (pageText) {
-              expect(pageText).to.be('logstash-*');
-              // return
-            });
-          });
-        })
-        // Sort by Name
-        .then(function sortByName() {
-          return settingsPage.sortBy('name');
-        })
-        // check name sort
-        .then(function sortAgain() {
-          return settingsPage.getTableRow(0, 0)
-          .then(function (row) {
-            return row.getVisibleText()
-            .then(function (rowText) {
-              //common.log('After name-sort first row first column = ' + rowText);
-              expect(rowText).to.be('@message');
-            });
-          });
-        })
-        // Sort by Name again
-        .then(function sortByName2() {
-          return settingsPage.sortBy('name');
-        })
-        // check name sort
-        .then(function sortAgain2() {
-          return settingsPage.getTableRow(0, 0)
-          .then(function (row) {
-            return row.getVisibleText()
-            .then(function (rowText) {
-              //common.log('After name-sort first row first column = ' + rowText);
-              expect(rowText).to.be('xss.raw');
-            });
-          });
-        })
-        // Sort by type
-        .then(function sortByType() {
-          return settingsPage.sortBy('type');
-        })
-        // check type sort
-        .then(function checksort() {
-          return settingsPage.getTableRow(0, 1)
-          .then(function (row) {
-            return row.getVisibleText()
-            .then(function (rowText) {
-              //common.log('After type-sort first row first column = ' + rowText);
-              expect(rowText).to.be('_source');
-            });
-          });
-        })
-        // Sort by type again
-        .then(function sortByType2() {
-          return settingsPage.sortBy('type');
-        })
-        // check type sort
-        .then(function checksort2() {
-          return settingsPage.getTableRow(0, 1)
-          .then(function (row) {
-            return row.getVisibleText()
-            .then(function (rowText) {
-              common.log('After type-sort first row first column = ' + rowText);
-              expect(rowText).to.be('string');
-            });
-          });
-        })
-        // Sort by type again (this time it "unsorts it")
-        .then(function sortByType2() {
-          return settingsPage.sortBy('type');
-        })
-        // check pagination
-        .then(function getFieldsTabCount() {
-          return settingsPage.getFieldsTabCount()
-          .then(function (tabCount) {
-            common.log('fields item count = ' + tabCount);
-            expect(tabCount).to.be('85');
-          });
-        })
-        // verify the page size is 25
-        .then(function checkPageSize() {
-          return settingsPage.getPageSize()
-          .then(function (pageSize) {
-            expect(pageSize).to.be('25');
-          });
-        })
-        // we know with 25 fields per page and 85 fields there should be 4 pages.
-        // the first page should have 25 items on it.
-        .then(function getPageFieldCount() {
-          return settingsPage.getPageFieldCount()
-          .then(function (pageCount) {
-            common.log('Page 1 count = ' + pageCount.length);
-            expect(pageCount.length).to.be(25);
-          });
-        })
-        //page 2 should also have 25 items
-        .then(function goPage2() {
-          return settingsPage.goToPage(2);
-        })
-        .then(function getPageFieldCount() {
-          return settingsPage.getPageFieldCount()
-          .then(function (pageCount) {
-            common.log('Page 2 count = ' + pageCount.length);
-            expect(pageCount.length).to.be(25);
-          });
-        })
-        //page 3 should also have 25 items
-        .then(function goPage3() {
-          return settingsPage.goToPage(3);
-        })
-        .then(function getPageFieldCount() {
-          return settingsPage.getPageFieldCount()
-          .then(function (pageCount) {
-            common.log('Page 3 count = ' + pageCount.length);
-            expect(pageCount.length).to.be(25);
-          });
-        })
-        //page 4 should also have 10 items
-        .then(function goPage4() {
-          return settingsPage.goToPage(4);
-        })
-        .then(function getPageFieldCount() {
-          return settingsPage.getPageFieldCount()
-          .then(function (pageCount) {
-            common.log('Page 4 count = ' + pageCount.length);
-            expect(pageCount.length).to.be(10);
-          });
-        })
-        .then(function () {
-          return common.tryForTime(3000, function () {
-            // delete the index pattern -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X
-            return settingsPage.clickDeletePattern();
-          });
-        })
-        .then(function () {
-          return common.tryForTime(3000, function () {
-            return remote.getAlertText();
-          });
-        })
-        .then(function () {
-          return remote.getAlertText()
-          .then(function (alertText) {
-            common.log('alertText = ' + alertText);
-            expect(alertText).to.be(expectedAlertText);
-          });
-        })
-        .then(function () {
-          return remote.acceptAlert();
-        })
-        .catch(function screenshotError(reason) {
-          return common.screenshotError(testSubName, reason);
-        });
-      },
-
-
-      testIndexPatternPopularity: function () {
-        var testSubName = 'testIndexPatternPopularity';
-
-        return settingsPage.selectTimeFieldOption('@timestamp')
-        .then(function () {
-          return settingsPage.getCreateButton().click();
-        })
-        // check the page header to make sure we see logstash-*
-        .then(function () {
-          return settingsPage.getIndexPageHeading()
-          .then(function (getIndexPageHeading) {
-            return getIndexPageHeading.getVisibleText()
-            .then(function (pageText) {
-              expect(pageText).to.be('logstash-*');
-              // return
-            });
-          });
-        })
-        .then(function () {
-          return settingsPage.setPageSize('All');
-        })
-        // increase Popularity
-        .then(function openControlsByName() {
-          common.log('Starting openControlsByName "geo.coordinates"');
-          return settingsPage.openControlsByName('geo.coordinates');
-        })
-        .then(function increasePopularity() {
-          common.log('increasePopularity');
-          return settingsPage.increasePopularity();
-        })
-        .then(function getPopularity() {
-          common.log('getPopularity');
-          return settingsPage.getPopularity()
-          .then(function (popularity) {
-            common.log('popularity = ' + popularity);
-            expect(popularity).to.be('1');
-          });
-        })
-        // Cancel saving the popularity change
-        .then(function controlChangeCancel() {
-          return settingsPage.controlChangeCancel();
-        })
-        // set the page size to All again, https://github.com/elastic/kibana/issues/5030
-        .then(function () {
-          return settingsPage.setPageSize('All');
-        })
-        .then(function openControlsByName() {
-          return settingsPage.openControlsByName('geo.coordinates');
-        })
-        // check that its 0 (previous increase was cancelled)
-        .then(function getPopularity() {
-          return settingsPage.getPopularity()
-          .then(function (popularity) {
-            common.log('popularity = ' + popularity);
-            expect(popularity).to.be('0');
-          });
-        })
-        .then(function increasePopularity() {
-          return settingsPage.increasePopularity();
-        })
-        // Saving the popularity change
-        .then(function controlChangeSave() {
-          return settingsPage.controlChangeSave();
-        })
-        // set the page size to All again, https://github.com/elastic/kibana/issues/5030
-        .then(function () {
-          return settingsPage.setPageSize('All');
-        })
-        // open it again to see that it saved
-        .then(function openControlsByName() {
-          return settingsPage.openControlsByName('geo.coordinates');
-        })
-        // check that its 0 (previous increase was cancelled)
-        .then(function getPopularity() {
-          return settingsPage.getPopularity()
-          .then(function (popularity) {
-            common.log('popularity = ' + popularity);
-            expect(popularity).to.be('1');
-          });
-        })
-        // Cancel saving the popularity change (we didn't make a change in this case, just checking the value)
-        .then(function controlChangeCancel() {
-          return settingsPage.controlChangeCancel();
-        })
-        // should this test go to discover page and verify the Popular field?
-        .then(function () {
-          return common.tryForTime(3000, function () {
-            // delete the index pattern
-            return settingsPage.clickDeletePattern();
-          });
-        })
-        .then(function () {
-          return common.tryForTime(3000, function () {
-            return remote.getAlertText();
-          });
-        })
-        .then(function () {
-          return remote.getAlertText()
-          .then(function (alertText) {
-            common.log('alertText = ' + alertText);
-            expect(alertText).to.be(expectedAlertText);
-          });
-        })
-        .then(function () {
-          return remote.acceptAlert();
-        })
-        .catch(function screenshotError(reason) {
-          return common.screenshotError(testSubName, reason);
-        });
-      }
-
-
-    };
-  });
-});
diff --git a/test/intern.js b/test/intern.js
index bd9fdf26035c..76aba2141902 100644
--- a/test/intern.js
+++ b/test/intern.js
@@ -12,8 +12,7 @@ define(function (require) {
     }],
     tunnelOptions: serverConfig.webdriver,
     functionalSuites: [
-      'test/functional/status.js',
-      'test/functional/testSettings'
+      'test/functional/apps/settings/testSettings'
     ],
     excludeInstrumentation: /(fixtures|node_modules)\//,
     loaderOptions: {