diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
index 715945364d39bd851a587a8d5d9c4c0c47f58f5c..b94941c23a56ea43ef88bfcde23d1b107aa8c5fe 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
@@ -81,31 +81,10 @@ Grouping from account transaction view\n
   <td></td>\n
 </tr>\n
 \n
-<!-- switch on the \'your_grouping\' flag -->\n
+<!-- The mode should be \'grouping\' by default -->\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
-  <td>off</td>\n
-</tr>\n
-<tr>\n
-  <td>click</td>\n
-  <td>field_your_grouping</td>\n
-  <td></td>\n
-</tr>\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//input[@id="dialog_update_button"]</td>\n
-  <td></td>\n
-</tr>\n
-<tr>\n
-  <td>assertPortalStatusMessage</td>\n
-  <td>Updated</td>\n
-  <td></td>\n
-</tr>\n
-\n
-<tr>\n
-  <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>on</td>\n
 </tr>\n
 <tr>\n
@@ -238,17 +217,15 @@ Grouping from account transaction view\n
   <td></td>\n
 </tr>\n
 \n
-\n
-<!-- switch off the \'your_grouping\' flag, to see grouped lines, and ungroup\n
-them -->\n
+<!-- Swith to \'ungrouping\' mode to see grouped lines, and ungroup them -->\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>on</td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'ungrouping\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -263,9 +240,14 @@ them -->\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>off</td>\n
 </tr>\n
+<tr>\n
+  <td>verifyValue</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'ungrouping\']</td>\n
+  <td>on</td>\n
+</tr>\n
 \n
 <tr tal:condition="is_selenium_0_8">\n
   <td>verifySelectedLabel</td>\n
@@ -356,12 +338,12 @@ them -->\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>off</td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -376,7 +358,7 @@ them -->\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>on</td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
index 471cd864070e3415fee484b635f647f97f1aba40..84f8b369c662840e5d2a58a3fb2db24a46419c3a 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
@@ -81,31 +81,10 @@ Grouping from entity transaction view\n
   <td></td>\n
 </tr>\n
 \n
-<!-- switch on the \'your_grouping\' flag -->\n
+<!-- The mode should be \'grouping\' by default -->\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
-  <td>off</td>\n
-</tr>\n
-<tr>\n
-  <td>click</td>\n
-  <td>field_your_grouping</td>\n
-  <td></td>\n
-</tr>\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//input[@id="dialog_update_button"]</td>\n
-  <td></td>\n
-</tr>\n
-<tr>\n
-  <td>assertPortalStatusMessage</td>\n
-  <td>Updated</td>\n
-  <td></td>\n
-</tr>\n
-\n
-<tr>\n
-  <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>on</td>\n
 </tr>\n
 <tr>\n
@@ -210,16 +189,15 @@ Grouping from entity transaction view\n
 </tr>\n
 \n
 \n
-<!-- switch off the \'your_grouping\' flag, to see grouped lines, and ungroup\n
-them -->\n
+<!-- Swith to \'ungrouping\' mode to see grouped lines, and ungroup them -->\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>on</td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'ungrouping\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -234,9 +212,14 @@ them -->\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>off</td>\n
 </tr>\n
+<tr>\n
+  <td>verifyValue</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'ungrouping\']</td>\n
+  <td>on</td>\n
+</tr>\n
 \n
 <tr tal:condition="is_selenium_0_8">\n
   <td>verifySelectedLabel</td>\n
@@ -327,12 +310,12 @@ them -->\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>off</td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -347,7 +330,7 @@ them -->\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>field_your_grouping</td>\n
+  <td>//input[@name=\'field_your_grouping\' and @value=\'grouping\']</td>\n
   <td>on</td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index 9d1ce53f8cc2ee2d55094091042b3fd02f9bd1ce..3ca9062a11783e80eeffeb9613eb9e38b528bfab 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-82
\ No newline at end of file
+84
\ No newline at end of file