         XCTAssert(secondWebsite.url.contains(app.textFields["url"].value! as! String), "The tab has not been dropped correctly")
     }
         
-    func testRearrangeTabsTabTrayIsKeptinTopTabs() {
+    // 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)

    func testDragAndDropBookmarkEntry() {
        if skipPlatform { return }

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


        // Leave Tab Tray and check order in Top Tabs
        app.collectionViews.cells[firstWebsite.tabName].tap()
        checkTabsOrder(dragAndDropTab: true, firstTab: secondWebsite.tabName, secondTab: firstWebsite.tabName)
    }*/

    // This test drags the address bar and since it is not possible to drop it on another app, lets do it in a search box
    /* Disable since the drag and drop is not working fine in this scenario on simulator
