diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/forum/testCreateDiscussionThread.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/forum/testCreateDiscussionThread.xml
index f7997f63640ceb2448e829c9efa4b520e24edef7..b32a0a8e5f62a764fda46bb7eb964ff3fb0691dc 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/forum/testCreateDiscussionThread.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/forum/testCreateDiscussionThread.xml
@@ -101,7 +101,7 @@
 </tr>\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>document.forms[0].elements[\'Base_doAction:method\'][1]</td>\n
+\t<td>//a[@class=\'menu-link\' and @title=\'Publish Document\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/km_gadgets/testLatestContentGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/km_gadgets/testLatestContentGadget.xml
index 1b4e11c1b045123fbc6c3c5a4f790aba2a754f89..63ecd1f64f22dd03ab1a7694e90e968ead0ac250 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/km_gadgets/testLatestContentGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/km_gadgets/testLatestContentGadget.xml
@@ -66,7 +66,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'Documents\']</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Documents\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -76,7 +76,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'Add Drawing\']</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Add Drawing\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -116,7 +116,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'Release Document\']</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Release Document\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -183,9 +183,7 @@
 \n
 </tbody></table>\n
 </body>\n
-</html>\n
-\n
-
+</html>
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
index 44449e020ad32cc0ebc81b30e0e002da6937961c..86162bb7998135f747af99ca5b776ce618e4b4cd 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
@@ -70,7 +70,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//li[@id=\'edit-document-toolbox\']/div/ul/li/a/span</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Edit Web Section details\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -100,7 +100,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//div[@id=\'wrapper_path\']/div/fieldset/div[1]/div/ul/li[2]/a</td>\n
+  <td>link=Section 1</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -136,7 +136,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//li[@id=\'edit-document-toolbox\']/div/ul/li[3]/a/span</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Edit Parent Web Section\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -156,7 +156,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//div[@id=\'wrapper_path\']/div/fieldset/div[1]/div/ul/li[2]/a</td>\n
+  <td>link=Section 1</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testCreatePerson.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testCreatePerson.xml
index fd1d53311ba1839338921cb17bf04e6aa6655983..b024342c83606b5f7d04f20b68077d9c625f4dcd 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testCreatePerson.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testCreatePerson.xml
@@ -65,7 +65,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@name=\'Base_doModule:method\' and @title=\'Persons\']</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Persons\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -75,7 +75,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>Base_doAction:method</td>\n
+  <td>//a[@class=\'menu-link\' and @title=\'Add Person\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml
index 62347ef378111faeb6532731af740fb529bcd9a9..a40b501d59570aa13dc1b0557104703674bb0a53 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml
@@ -65,7 +65,7 @@
 </tr>\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>Base_doModule:method</td>\n
+\t<td>//a[@class=\'menu-link\' and @title=\'Documents\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -75,7 +75,7 @@
 </tr>\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>Base_doAction:method</td>\n
+\t<td>//a[@class=\'menu-link\' and @title=\'Add Drawing\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -185,8 +185,6 @@
 \t<td>reference-z</td>\n
 </tr>\n
 \n
-\n
-\n
 <tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_km_ui_test/bt/revision b/bt5/erp5_km_ui_test/bt/revision
index 34bba940d19c5c03f8a0d63433cba1cf420f1d71..2bab4226fc3d27e9a3034dc5c0cd22f5b9b30888 100644
--- a/bt5/erp5_km_ui_test/bt/revision
+++ b/bt5/erp5_km_ui_test/bt/revision
@@ -1 +1 @@
-156
\ No newline at end of file
+157
\ No newline at end of file