diff --git a/tests/cocroachdb.html b/tests/cocroachdb.html
index 528d5f49..7181c3e3 100644
--- a/tests/cocroachdb.html
+++ b/tests/cocroachdb.html
@@ -17,7 +17,7 @@
 <tr><td>type</td><td>name=auth[server]</td><td>localhost:26257</td></tr>
 <tr><td>type</td><td>id=username</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[password]</td><td>ODBC</td></tr>
-<tr><td>clickAndWait</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>clickAndWait</td><td>//input[@value='Login']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>CockroachDB</td><td></td></tr>
 </tbody></table>
 
@@ -110,7 +110,7 @@
 <tr><td>click</td><td>link=Create check</td><td></td></tr>
 <tr><td>type</td><td>name=name</td><td>albums_interpret_check</td></tr>
 <tr><td>runScript</td><td>document.querySelector('[name="clause"]').value = 'interpret > 0'</td><td></td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Check has been created.</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?pgsql=localhost:26257&amp;username=ODBC&amp;db=adminer_test&amp;ns=public&amp;check=albums&amp;name=albums_interpret_check</td><td></td></tr>
 <tr><td>verifyTextPresent<td>((interpret > 0:::INT8))</td><td></td></tr>
@@ -267,7 +267,7 @@
 <tr><td>click</td><td>link=New item</td><td></td></tr>
 <tr><td>verifyTextNotPresent</td><td>stored</td><td></td></tr>
 <tr><td>type</td><td>name=fields[normal]</td><td>20</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>220</td><td></td></tr>
 </tbody></table>
 
diff --git a/tests/mariadb.html b/tests/mariadb.html
index 7b436906..4fe336b5 100644
--- a/tests/mariadb.html
+++ b/tests/mariadb.html
@@ -16,7 +16,7 @@
 <tr><td>type</td><td>id=username</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[server]</td><td>localhost:3307</td></tr>
 <tr><td>type</td><td>name=auth[password]</td><td>ODBC</td></tr>
-<tr><td>clickAndWait</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>clickAndWait</td><td>//input[@value='Login']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>MariaDB</td><td></td></tr>
 <tr><td>clickAndWait</td><td>link=SQL command</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?server=localhost:3307&amp;username=ODBC&amp;sql=DROP+DATABASE+IF+EXISTS+adminer_test</td><td></td></tr>
@@ -159,7 +159,7 @@
 <tr><td>click</td><td>link=Create check</td><td></td></tr>
 <tr><td>type</td><td>name=name</td><td>albums_interpret_check</td></tr>
 <tr><td>runScript</td><td>document.querySelector('[name="clause"]').value = 'interpret > 0'</td><td></td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Check has been created.</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?server=localhost:3307&amp;username=ODBC&amp;db=adminer_test&amp;check=albums&amp;name=albums_interpret_check</td><td></td></tr>
 <tr><td>verifyTextPresent<td>`interpret` > 0</td><td></td></tr>
@@ -370,7 +370,7 @@
 <tr><td>verifyTextNotPresent</td><td>virtual</td><td></td></tr>
 <tr><td>verifyTextNotPresent</td><td>stored</td><td></td></tr>
 <tr><td>type</td><td>name=fields[normal]</td><td>20</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>120</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>220</td><td></td></tr>
 </tbody></table>
diff --git a/tests/mssql.html b/tests/mssql.html
index f5088e8e..a974a9db 100644
--- a/tests/mssql.html
+++ b/tests/mssql.html
@@ -17,7 +17,7 @@
 <tr><td>type</td><td>name=auth[server]</td><td>(local)</td></tr>
 <tr><td>type</td><td>id=username</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[password]</td><td>ODBC</td></tr>
-<tr><td>clickAndWait</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>clickAndWait</td><td>//input[@value='Login']</td><td></td></tr>
 </tbody></table>
 
 <table cellpadding="1" cellspacing="1" border="1">
@@ -109,7 +109,7 @@
 <tr><td>click</td><td>link=Create check</td><td></td></tr>
 <tr><td>type</td><td>name=name</td><td>albums_interpret_check</td></tr>
 <tr><td>runScript</td><td>document.querySelector('[name="clause"]').value = 'interpret > 0'</td><td></td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Check has been created.</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?mssql=%28local%29&amp;username=ODBC&amp;db=adminer_test&amp;ns=dbo&amp;check=albums&amp;name=albums_interpret_check</td><td></td></tr>
 <tr><td>verifyTextPresent<td>([interpret]>(0))</td><td></td></tr>
@@ -240,7 +240,7 @@
 <tr><td>verifyTextNotPresent</td><td>virtual</td><td></td></tr>
 <tr><td>verifyTextNotPresent</td><td>stored</td><td></td></tr>
 <tr><td>type</td><td>name=fields[normal]</td><td>20</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>120</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>220</td><td></td></tr>
 </tbody></table>
diff --git a/tests/mysql.html b/tests/mysql.html
index c25bb382..4916f378 100644
--- a/tests/mysql.html
+++ b/tests/mysql.html
@@ -16,7 +16,7 @@
 <tr><td>clickAndWait</td><td>css=#lang &gt; input[type="submit"]</td><td></td></tr>
 <tr><td>type</td><td>id=username</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[password]</td><td>ODBC</td></tr>
-<tr><td>clickAndWait</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>clickAndWait</td><td>//input[@value='Login']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Logged as</td><td></td></tr>
 <tr><td>clickAndWait</td><td>link=SQL command</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?username=ODBC&amp;sql=DROP+DATABASE+IF+EXISTS+adminer_test</td><td></td></tr>
@@ -159,7 +159,7 @@
 <tr><td>click</td><td>link=Create check</td><td></td></tr>
 <tr><td>type</td><td>name=name</td><td>albums_interpret_check</td></tr>
 <tr><td>runScript</td><td>document.querySelector('[name="clause"]').value = 'interpret > 0'</td><td></td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Check has been created.</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?username=ODBC&amp;db=adminer_test&amp;check=albums&amp;name=albums_interpret_check</td><td></td></tr>
 <tr><td>verifyTextPresent<td>(`interpret` > 0)</td><td></td></tr>
@@ -370,7 +370,7 @@
 <tr><td>verifyTextNotPresent</td><td>virtual</td><td></td></tr>
 <tr><td>verifyTextNotPresent</td><td>stored</td><td></td></tr>
 <tr><td>type</td><td>name=fields[normal]</td><td>20</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>120</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>220</td><td></td></tr>
 </tbody></table>
@@ -393,7 +393,7 @@
 <thead><tr><td rowspan="1" colspan="3">Warnings</td></tr></thead>
 <tbody>
 <tr><td>open</td><td>/adminer/?username=ODBC&amp;db=adminer_test&amp;select=albums</td><td></td></tr>
-<tr><td>click</td><td>xpath=(//a[contains(text(),'=')])[1]</td><td></td></tr>
+<tr><td>click</td><td>(//a[contains(text(),'=')])[1]</td><td></td></tr>
 <tr><td>type</td><td>name=where[0][val]</td><td>1.2.3</td></tr>
 <tr><td>submit</td><td>id=form</td><td></td></tr>
 <tr><td>click</td><td>link=Warnings</td><td></td></tr>
@@ -407,7 +407,7 @@
 <tr><td>select</td><td>name=lang</td><td>label=English</td></tr>
 <tr><td>clickAndWait</td><td>css=#lang &gt; input[type="submit"]</td><td></td></tr>
 <tr><td>type</td><td>name=auth[username]</td><td>admin</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Login']</td><td></td></tr>
 <tr><td>clickAndWait</td><td>link=Interprets</td><td></td></tr>
 <tr><td>clickAndWait</td><td>link=New item</td><td></td></tr>
 <tr><td>type</td><td>fields[name]</td><td>Michael Jackson</td></tr>
diff --git a/tests/pgsql.html b/tests/pgsql.html
index 4be4fb74..f6590509 100644
--- a/tests/pgsql.html
+++ b/tests/pgsql.html
@@ -17,7 +17,7 @@
 <tr><td>type</td><td>id=username</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[password]</td><td>ODBC</td></tr>
 <tr><td>type</td><td>name=auth[db]</td><td>adminer_test</td></tr>
-<tr><td>clickAndWait</td><td>xpath=//input[@value='Login']</td><td></td></tr>
+<tr><td>clickAndWait</td><td>//input[@value='Login']</td><td></td></tr>
 </tbody></table>
 
 <table cellpadding="1" cellspacing="1" border="1">
@@ -109,7 +109,7 @@
 <tr><td>click</td><td>link=Create check</td><td></td></tr>
 <tr><td>type</td><td>name=name</td><td>albums_interpret_check</td></tr>
 <tr><td>runScript</td><td>document.querySelector('[name="clause"]').value = 'interpret > 0'</td><td></td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Check has been created.</td><td></td></tr>
 <tr><td>open</td><td>/adminer/?pgsql=&amp;username=ODBC&amp;db=adminer_test&amp;ns=public&amp;check=albums&amp;name=albums_interpret_check</td><td></td></tr>
 <tr><td>verifyTextPresent<td>(interpret > 0)</td><td></td></tr>
@@ -269,7 +269,7 @@
 <tr><td>click</td><td>link=New item</td><td></td></tr>
 <tr><td>verifyTextNotPresent</td><td>stored</td><td></td></tr>
 <tr><td>type</td><td>name=fields[normal]</td><td>20</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>220</td><td></td></tr>
 </tbody></table>
 
diff --git a/tests/sqlite.html b/tests/sqlite.html
index 5853889b..f225000b 100644
--- a/tests/sqlite.html
+++ b/tests/sqlite.html
@@ -29,7 +29,7 @@
 <tr><td>click</td><td>css=label.block &gt; input[name="auto_increment_col"]</td><td></td></tr>
 <tr><td>type</td><td>name=fields[1.1][field]</td><td>name</td></tr>
 <tr><td>select</td><td>name=fields[1.1][type]</td><td>label=text</td></tr>
-<tr><td>click</td><td>xpath=(//input[@value='Save'])[2]</td><td></td></tr>
+<tr><td>click</td><td>(//input[@value='Save'])[2]</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>Table has been created.</td><td></td></tr>
 <tr><td>click</td><td>link=New item</td><td></td></tr>
 <tr><td>type</td><td>name=fields[name]</td><td>Michael Jackson</td></tr>
@@ -42,7 +42,7 @@
 <tr><td>select</td><td>name=fields[1.1][on_delete]</td><td>label=CASCADE</td></tr>
 <tr><td>type</td><td>name=fields[1.11][field]</td><td>title</td></tr>
 <tr><td>select</td><td>name=fields[1.11][type]</td><td>label=text</td></tr>
-<tr><td>click</td><td>xpath=(//input[@value='Save'])[2]</td><td></td></tr>
+<tr><td>click</td><td>(//input[@value='Save'])[2]</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>interprets(id)</td><td></td></tr>
 <tr><td>click</td><td>link=New item</td><td></td></tr>
 <tr><td>type</td><td>name=fields[interpret]</td><td>1</td></tr>
@@ -70,7 +70,7 @@
 <tr><td>click</td><td>link=New item</td><td></td></tr>
 <tr><td>verifyTextNotPresent</td><td>stored</td><td></td></tr>
 <tr><td>type</td><td>name=fields[normal]</td><td>20</td></tr>
-<tr><td>click</td><td>xpath=//input[@value='Save']</td><td></td></tr>
+<tr><td>click</td><td>//input[@value='Save']</td><td></td></tr>
 <tr><td>verifyTextPresent</td><td>220</td><td></td></tr>
 </tbody></table>