diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
index e98a56ff209b97c2ebef4de8c2d9c2f31bb12f05..b7eeac0160abbd1d102e733811cb57b3dcecf516 100644
--- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
+++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
@@ -43,11 +43,7 @@
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init"\n
             tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr tal:condition="is_selenium_0_8">\n
       <td>setTimeout</td>\n
       <td>600000</td>\n
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index 5a396e28e80321703d56c67ec21cc076b67f5d46..3fdc173dabdd1038c973c374ec30f55cfddafdfb 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-121
\ No newline at end of file
+122
\ No newline at end of file
diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
index 8fa5ad61cf3d245347050b0767625ec84fa36659..21778ce936f983864c37664146636ad8ad401611 100644
--- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
+++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
@@ -43,11 +43,7 @@
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init"\n
             tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr tal:condition="is_selenium_0_8">\n
       <td>setTimeout</td>\n
       <td>600000</td>\n
diff --git a/bt5/erp5_pdm_ui_test/bt/revision b/bt5/erp5_pdm_ui_test/bt/revision
index da2d3988d7d1a255376770b1e87394ebb42febb3..3f10ffe7a4c473619c926cfb1e8d95e726e5a0ec 100644
--- a/bt5/erp5_pdm_ui_test/bt/revision
+++ b/bt5/erp5_pdm_ui_test/bt/revision
@@ -1 +1 @@
-14
\ No newline at end of file
+15
\ No newline at end of file
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml
index f5c1b907aeb90681fe6ddc5e82df1306caac91fb..1a569c6ee5b02d315d083106cc79cf62f4db67dc 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml
@@ -59,11 +59,7 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr>\n
       <td>open</td>\n
       <td>${base_url}/foo_module/BTZuite_reset</td>\n
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml
index 4de77151e3f56ebbc9e04479393ced94d7b0a214..0793ef800774fead66bc47a3369f1043121a19e1 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml
@@ -59,11 +59,7 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr>\n
       <td>open</td>\n
       <td>${base_url}/foo_module/ListBoxDialogModeZuite_reset</td>\n
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml
index 8f3bbb2149c2f9e9a17b67108c7d98ec8f710335..6102f6608434baa471d16583b928eb0dc6fbf86f 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml
@@ -59,11 +59,7 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr>\n
       <td>open</td>\n
       <td>${base_url}/foo_module/ListBoxZuite_reset</td>\n
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml
index 2eda4e9719c056525ba250559e46dcabe46969ba..cf6825a5f9451ed37a86264abb07635361507809 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml
@@ -59,11 +59,7 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr>\n
       <td>open</td>\n
       <td>${base_url}/foo_module/ListBoxZuite_reset</td>\n
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml
index 9d609e181868064ba943a6a35f026877d8718abe..3e250e25f8d5b31de5261f6b39a99e622292ba66 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml
@@ -60,11 +60,7 @@
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init">\n
     <!-- reuse listbox suite reset to clear modules. -->\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr>\n
       <td>open</td>\n
       <td>${base_url}/foo_module/ListBoxZuite_reset</td>\n
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml
index 80ae9d3107e0a6dc3cd762d8dd57ca15e6d8389b..04559beeb2c2bad379ce1145da41e2ed71efe9b9 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml
@@ -59,11 +59,7 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init">\n
-    <tr>\n
-      <td>store</td>\n
-      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
-      <td>base_url</td>\n
-    </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
     <tr>\n
       <td>open</td>\n
       <td>${base_url}/foo_module/ListBoxZuite_reset</td>\n
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index 3cf63f91e6244ff47164dbf7d0f31e254faac1e3..82a1667ba9c07838b2607bd4cd318429d32f35d3 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-425
\ No newline at end of file
+426
\ No newline at end of file