diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py
index 22ca6740e76a4a09891259f564cf6b0d15f32e53..20506c1d7c406b0d3272433b64ae5d6dacfeb961 100644
--- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py
+++ b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py
@@ -5,8 +5,8 @@ subversion working copy paths and conversion server address.
 It's not meant to be called by zelenium tests directly.
 """
 
-if conversion_server_url is None and (conversion_server_address is None or conversion_server_port is None):
-  raise TypeError("argument conversion_server_url (or conversion_server_{address,port}) should not be None")
+if conversion_server_url is None:
+  raise TypeError("argument conversion_server_url should not be None")
 
 pref = getattr(context.portal_preferences, "erp5_ui_test_preference", None)
 if pref is None:
@@ -27,8 +27,6 @@ if pref is None:
                                                priority=1)
 
 pref.setPreferredDocumentConversionServerUrl(conversion_server_url)
-pref.setPreferredOoodocServerAddress(conversion_server_hostname)
-pref.setPreferredOoodocServerPortNumber(conversion_server_port)
 
 if pref.getPreferenceState() == 'disabled':
   pref.enable()
diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml
index 1010f4bda5fd3e7b5c097fb35437c71918427970..05d773990abc60a463417a45235d2ebb9c38c5d6 100644
--- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml
+++ b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>working_copy_list, conversion_server_hostname=None, conversion_server_port=None, conversion_server_url=None</string> </value>
+            <value> <string>working_copy_list, conversion_server_url=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py b/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
index 834daead752d24cfba2ac95edf33f3e5a7d738db..352542a52c18808483941125a7ce17b153f6e225 100644
--- a/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
@@ -377,8 +377,6 @@ class ERP5TypeFunctionalTestCase(ERP5TypeTestCase):
     self.portal.Zuite_setPreference(
        working_copy_list=bt5_dir_list,
        conversion_server_url=conversion_dict['url'],
-       conversion_server_hostname=conversion_dict['hostname'],
-       conversion_server_port=conversion_dict['port']
       )
     # XXX Memcached is missing
     # XXX Persistent cache setup is missing
diff --git a/product/ERP5Type/tests/runFunctionalTest.py b/product/ERP5Type/tests/runFunctionalTest.py
index 94b13494732ef1ce14c9f7275ff10c5e4e5ebaf2..f090f599877555a562b4aeb058b20dc2e4b92656 100644
--- a/product/ERP5Type/tests/runFunctionalTest.py
+++ b/product/ERP5Type/tests/runFunctionalTest.py
@@ -287,14 +287,9 @@ user_pref("capability.principal.codebase.p1.subjectName", "");""" % \
     conversion_server_port = os.environ.get('conversion_server_port', '8008')
     urllib2.urlopen('%s/Zuite_setPreference?__ac_name='
                     '%s&__ac_password=%s&working_copy_list=%s'
-                    '&conversion_server_url=%s'
-                    '&conversion_server_hostname=%s'
-                    '&conversion_server_port=%s'%
+                    '&conversion_server_url=%s'%
                     (self.portal_url, self.user, self.password,
-                      bt5_dir_list, conversion_server_url,
-                      conversion_server_hostname,
-                      conversion_server_port))
-
+                      bt5_dir_list, conversion_server_url,))
 
   def unsubscribeFromTimerService(self):
     urllib2.urlopen('%s/portal_activities/?unsubscribe:method='