diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php
index 95e99f4cc2..d88254c07e 100644
--- a/test/selenium/PmaSeleniumXssTest.php
+++ b/test/selenium/PmaSeleniumXssTest.php
@@ -18,6 +18,11 @@ require_once 'TestBase.php';
  */
 class PMA_SeleniumXSSTest extends PMA_SeleniumBase
 {
+    public function setUpPage()
+    {
+        parent::setUpPage();
+        $this->login();
+    }
     /**
      * Tests the SQL query tab with a null query
      *
@@ -30,8 +35,7 @@ class PMA_SeleniumXSSTest extends PMA_SeleniumBase
         if (mb_strtolower($this->getBrowser()) == 'safari') {
             $this->markTestSkipped('Alerts not supported on Safari browser.');
         }
-        $this->login();
-        $this->waitForElement('byLinkText', "SQL")->click();
+        $this->waitForElement('byPartialLinkText', "SQL")->click();
         $this->waitForElement("byId", "queryboxf");
         $this->byId("button_submit_query")->click();
         $this->assertEquals("Missing value in the form!", $this->alertText());