diff --git a/test/functional/testSettings.js b/test/functional/testSettings.js
index fc944fc17941..342e81e714c7 100644
--- a/test/functional/testSettings.js
+++ b/test/functional/testSettings.js
@@ -37,27 +37,32 @@ define(function (require) {
 
       beforeEach: function () {
         // start each test with an empty kibana index
-        return common
-          .sleep(1000)
-          .then(function () {
-            return scenarioManager
-              .unload('emptyKibana');
-          })
-          .then(function () {
-            return common
-              .sleep(2000);
-          })
-          .then(function () {
+        return scenarioManager
+          .reload('emptyKibana')
+          // and load a minimal set of makelogs data
+          .then(function loadIfEmptyMakelogs() {
             return scenarioManager
               .load('emptyKibana');
           })
           .then(function () {
-            return scenarioManager
-              .loadIfEmpty('logstash');
-          })
-          .then(function () {
-            return common
-              .sleep(2000);
+            return common.tryForTime(5000, function () {
+              return self.remote
+                .get(
+                  url.format(_.assign(config.kibana, {
+                    pathname: ''
+                  })))
+                .then(function () {
+                  return common
+                    .sleep(500);
+                })
+                .then(function () {
+                  return self.remote
+                    .getCurrentUrl()
+                    .then(function (currentUrl) {
+                      expect(currentUrl).to.contain('settings');
+                    });
+                });
+            });
           });
       },