diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
index 06f11a055cf7e32cbef31c2a7cbf2a93a8937334..6c2030201806ed0d44ec1167ea42901b533edeb7 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -82,7 +79,7 @@
 have id "2". This is probably a bit too stupid. -->\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/2/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="python: \'glob:%s/foo_module/2/view*\' % here.getPortalObject().absolute_url()"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -103,7 +100,7 @@ have id "2". This is probably a bit too stupid. -->\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/2/1/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="python: \'glob:%s/foo_module/2/1/view*\' % here.getPortalObject().absolute_url()"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -131,7 +128,7 @@ have id "2". This is probably a bit too stupid. -->\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/3/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/3/view*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -153,7 +150,7 @@ another object of the same type. -->\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/4/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/4/Foo_view*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml
index 9d8e386249f843db693d1bb621028352885d2134..de03f4b9535c196994ae333f72d2cd1f285317b3 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -118,7 +115,7 @@
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td>${base_url}/foo_module/0/Foo_view</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/Foo_view*"/>\n
   <td></td>\n
 </tr>\n
 <!-- We check that the transition has not been passed by looking at the\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml
index f38acf65c810c1ad89e72b13e27b3540f45651bf..787a348bf665a8f35d37ebd4a48849e061bd21d5 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml
index b57aacb137587a86d678fcbf8b4305476e15e7e4..a2a09282690bbe2bcb7f4fa15c2951c04964676c 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
index a49e7f7f57d75b3764a8b94d517e3ef3a6ba1bbd..44bc15b63475c2cded4bd5fd26a4779dd5470712 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
@@ -79,7 +79,7 @@
 have id "2". This is probably a bit too stupid. -->\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/2/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/view*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -100,7 +100,7 @@ have id "2". This is probably a bit too stupid. -->\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/2/1/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/1/view*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -122,7 +122,7 @@ another object of the same type. -->\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/2/2/FooLine_view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/2/FooLine_view*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -147,7 +147,7 @@ another object of the same type. -->\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td tal:content="python: \'%s/foo_module/3/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/3/view*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml
index f101bae4355090d02671a8a9d2de1635556edde6..3fa0833c65a923823b830e4de02957521c473a2c 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml
index a59ae2f784a9cbcb84f9b5a1147fa714801a1145..5b64e2074da97a125659657caef4ec5d76313e6d 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml
@@ -65,7 +65,7 @@
 \n
 <tr>\n
   <td>store</td>\n
-  <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n
+  <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
   <td>base_url</td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml
index 9348a2dcc2f373c2d72793c8df449033a5881ff9..0e9b70aea710c3dbbd735e5c4ab6ffe81d241e61 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml
index d82b05592badaf5c8988253e293194aced481445..26b164bbc4e2acd59b10ced479c86b4a8e0c0117 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml
index 65123f72deab0c1d6a8155400871c09f19644577..566525f642f365600a050facbbaa084cb3f4cadf 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml
index 7f3b3228dd9f9b4b3739a59469cc34aacdf324f4..cf8e4094e8bc38a22c69e45599d5deaf7ea6829e 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml
index ddf41fea5ebdd8158eb001d594eb9c0b56b4e0f1..d099050da0650552e254c1d3b483ad69e94bd91e 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml
index 7f6058d687a097135832cb75bfefd1f9eaaa44f0..1eaf186f6bd810e01a70dfba8431300bb74bf8a7 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -146,7 +143,7 @@
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td>${base_url}/foo_module/FooModule_viewFooList</td>\n
+  <td tal:replace="string:glob:${here/portal_url}/foo_module/FooModule_viewFooList*"/>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml
index b83ce6fa47f3288c5ec90439655894cf73d86f42..557e8772c1aab360add0762958ccecee9f7b4941 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -110,7 +107,7 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n
 </tr>\n
 <tr>\n
   <td>assertLocation</td>\n
-  <td>${base_url}/foo_module/0/Base_viewHistory</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/Base_viewHistory*"/>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml
index 06644990f477e71187b2a7673b523e967ccd3211..c0b9a97290f26b0a99e5daaf9347e6a14ad4af95 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index 832f62a3cbee4ea0a1147819b77db56a04e3de4c..91a3d4243df1581626c3a06d2332405e0241720b 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-339
\ No newline at end of file
+340
\ No newline at end of file