diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.html b/src/plugins/kibana/public/settings/sections/indices/_create.html
index 4bf6c76fec6c..7cf592c69441 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_create.html
+++ b/src/plugins/kibana/public/settings/sections/indices/_create.html
@@ -167,6 +167,7 @@
           </div>
 
           <button
+            data-test-subj="submitCreateIndexPatternFromExistingForm"
             ng-disabled="form.$invalid || index.fetchFieldsError"
             ng-class="index.fetchFieldsError ? 'btn-default' : 'btn-success'"
             type="submit"
diff --git a/test/support/pages/settings_page.js b/test/support/pages/settings_page.js
index 2f2ef521fac9..a1ec289a2f5c 100644
--- a/test/support/pages/settings_page.js
+++ b/test/support/pages/settings_page.js
@@ -130,13 +130,11 @@ define(function (require) {
     },
 
     getCreateButton: function () {
-      return this.remote.setFindTimeout(defaultTimeout)
-      .findByCssSelector('.btn');
+      return common.findTestSubject('submitCreateIndexPatternFromExistingForm');
     },
 
     clickCreateButton: function () {
-      return this.remote.setFindTimeout(defaultTimeout)
-      .findByCssSelector('.btn').click();
+      return common.findTestSubject('submitCreateIndexPatternFromExistingForm').click();
     },
 
     clickDefaultIndexButton: function () {
@@ -309,7 +307,7 @@ define(function (require) {
       return common.tryForTime(defaultTimeout, function () {
         return self.selectTimeFieldOption('@timestamp')
         .then(function () {
-          return self.getCreateButton().click();
+          return self.clickCreateButton();
         });
       })
       .then(function () {