diff --git a/test/components/bookmarksToolbarTest.js b/test/components/bookmarksToolbarTest.js
index 6ad530b5e9a..2ab552f2629 100644
--- a/test/components/bookmarksToolbarTest.js
+++ b/test/components/bookmarksToolbarTest.js
@@ -108,6 +108,7 @@ describe('bookmarksToolbar', function () {
         .waitForVisible(navigatorNotBookmarked)
         .click(navigatorNotBookmarked)
         .waitForVisible(doneButton)
+        .waitForBookmarkDetail(this.page1Url, 'Page 1')
         .waitForEnabled(doneButton)
         .selectByValue('#bookmarkParentFolder select', folderId2)
         .click(doneButton)
@@ -143,8 +144,10 @@ describe('bookmarksToolbar', function () {
         .waitForVisible(navigatorNotBookmarked)
         .click(navigatorNotBookmarked)
         .waitForVisible(doneButton)
+        .waitForBookmarkDetail(this.page1Url, 'Page 1')
+        .setInputText('#bookmarkName input', 'test1')
+        .waitForBookmarkDetail(this.page1Url, 'test1')
         .waitForEnabled(doneButton)
-        .setValue('#bookmarkName input', 'test1')
         .click(doneButton)
         .waitForVisible('.bookmarkToolbarButton[title^=test1]')
         .click('.bookmarkToolbarButton[title=demo1]')
@@ -176,6 +179,7 @@ describe('bookmarksToolbar', function () {
         .waitForVisible(navigatorNotBookmarked)
         .click(navigatorNotBookmarked)
         .waitForVisible(doneButton)
+        .waitForBookmarkDetail(pageWithFavicon, '')
         .waitForEnabled(doneButton)
         .click(doneButton)
 
@@ -201,6 +205,7 @@ describe('bookmarksToolbar', function () {
         .waitForVisible(navigatorNotBookmarked)
         .click(navigatorNotBookmarked)
         .waitForVisible(doneButton)
+        .waitForBookmarkDetail(pageWithoutFavicon, 'Favicon is not found page')
         .waitForEnabled(doneButton)
         .click(doneButton)
 
diff --git a/test/lib/brave.js b/test/lib/brave.js
index f1bc61c4f0e..91578b7090d 100644
--- a/test/lib/brave.js
+++ b/test/lib/brave.js
@@ -321,7 +321,7 @@ var exports = {
     })
 
     this.app.client.addCommand('waitForSiteEntry', function (location, waitForTitle = true) {
-      logVerbose('waitForSiteEntry(' + location + ', ' + waitForTitle + ')')
+      logVerbose('waitForSiteEntry("' + location + '", "' + waitForTitle + '")')
       return this.waitUntil(function () {
         return this.getAppState().then((val) => {
           const ret = val.value && val.value.sites && val.value.sites.find(
@@ -333,6 +333,22 @@ var exports = {
       })
     })
 
+    this.app.client.addCommand('waitForBookmarkDetail', function (location, title) {
+      logVerbose('waitForBookmarkDetail("' + location + '", "' + title + '")')
+      return this.waitUntil(function () {
+        return this.getWindowState().then((val) => {
+          const bookmarkDetailLocation = val.value && val.value.bookmarkDetail &&
+            val.value.bookmarkDetail.currentDetail && val.value.bookmarkDetail.currentDetail.location
+          const bookmarkDetailTitle = val.value && val.value.bookmarkDetail && val.value.bookmarkDetail.currentDetail &&
+            val.value.bookmarkDetail.currentDetail.customTitle || val.value.bookmarkDetail.currentDetail.title
+          const ret = bookmarkDetailLocation === location && bookmarkDetailTitle === title
+          logVerbose('waitForBookmarkDetail("' + location + '", "' + title + '") => ' + ret +
+            ' (bookmarkDetailLocation = ' + bookmarkDetailLocation + ', bookmarkDetailTitle = ' + bookmarkDetailTitle + ')')
+          return ret
+        })
+      })
+    })
+
     this.app.client.addCommand('loadUrl', function (url) {
       if (isSourceAboutUrl(url)) {
         url = getTargetAboutUrl(url)