diff --git a/test/selenium/PmaSeleniumCreateDropDatabaseTest.php b/test/selenium/PmaSeleniumCreateDropDatabaseTest.php
index fc4c847504..3377725464 100644
--- a/test/selenium/PmaSeleniumCreateDropDatabaseTest.php
+++ b/test/selenium/PmaSeleniumCreateDropDatabaseTest.php
@@ -22,16 +22,16 @@ class PmaSeleniumCreateDropDatabaseTest extends PHPUnit_Extensions_SeleniumTestC
     public function testCreateDropDatabase()
     {
         $log = new PmaSeleniumTestCase($this);
-        $dbname = "pma_testdb".time();
+        $dbname = 'pma_testdb' . time();
         $log->login(TESTSUITE_USER, TESTSUITE_PASSWORD);
         $this->click("link=Databases");
         $this->waitForElementPresent("id=text_create_db");
         $this->type("id=text_create_db", $dbname);
         $this->click("id=buttonGo");
         $this->waitForElementPresent("css=span.ajax_notification");
-        $this->assertElementPresent("css=span.ajax_notification div.success");	    	
-        $this->click("xpath=(//input[@name='selected_dbs[]'])[@value='".$dbname."']");
-        $this->click("css=button.mult_submit.ajax");
+        $this->assertElementPresent("css=span.ajax_notification div.success");
+        $this->click("css=input[name='selected_dbs[]'][value='" . $dbname . "']");
+        $this->click("css=button.mult_submit");
         $this->click("css=button:contains('OK')");
         $this->waitForElementPresent("css=span.ajax_notification");
         $this->assertElementPresent("css=span.ajax_notification div.success");