         if skipPlatform { return }
 
         // Drop a bookmark/history entry is only allowed on other apps. This test is to check that nothing happens within the app
+        waitForExistence(app.textFields["url"], timeout: 5)
+        waitForExistence(app.buttons["urlBar-cancel"], timeout: 5)
+        navigator.performAction(Action.CloseURLBarOpen)
+        navigator.nowAt(NewTabScreen)
         navigator.goto(BrowserTabMenu)
         navigator.goto(LibraryPanel_History)
 
         let firstEntryOnList = app.tables["History List"].cells.element(boundBy:
-            6).staticTexts[exampleDomainTitle]
-        let secondEntryOnList = app.tables["History List"].cells.element(boundBy: 3).staticTexts[twitterTitle]
+            5).staticTexts[exampleDomainTitle]
+        let secondEntryOnList = app.tables["History List"].cells.element(boundBy: 2).staticTexts[twitterTitle]
 
         XCTAssertTrue(firstEntryOnList.exists, "first entry before is not correct")
         XCTAssertTrue(secondEntryOnList.exists, "second entry before is not correct")

    func testDragAndDropBookmarkEntry() {
        if skipPlatform { return }

        navigator.goto(MobileBookmarks)
        waitForExistence(app.tables["Bookmarks List"])


        XCTAssert(secondWebsite.url.contains(app.textFields["url"].value! as! String), "The tab has not been dropped correctly")
    }
        
    // Disabled due to https://github.com/mozilla-mobile/firefox-ios/issues/8358
    /* func testRearrangeTabsTabTrayIsKeptinTopTabs() {
        if skipPlatform { return }
        openTwoWebsites()
        checkTabsOrder(dragAndDropTab: false, firstTab: firstWebsite.tabName, secondTab: secondWebsite.tabName)
