diff --git a/product/ERP5Type/tests/ERP5TypeTestCase.py b/product/ERP5Type/tests/ERP5TypeTestCase.py
index b52bb6d8ea5288c5a83980e09ae82f3bcaeae784..02e66e202f59c7662221ed55335b45b0957ed8b5 100644
--- a/product/ERP5Type/tests/ERP5TypeTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeTestCase.py
@@ -75,26 +75,7 @@ ZopeTestCase.installProduct('MailHost', quiet=install_product_quiet)
 ZopeTestCase.installProduct('PageTemplates', quiet=install_product_quiet)
 ZopeTestCase.installProduct('PythonScripts', quiet=install_product_quiet)
 ZopeTestCase.installProduct('ExternalMethod', quiet=install_product_quiet)
-try:
-  # Workaround iHotFix patch that doesn't work with
-  # ZopeTestCase REQUESTs
-  ZopeTestCase.installProduct('iHotfix', quiet=install_product_quiet)
-  from Products import iHotfix
-  from types import UnicodeType
-  # revert monkey patchs from iHotfix
-  iHotfix.get_request = get_request
-
-  originalStringIO = iHotfix.originalStringIO
-  class UnicodeSafeStringIO(originalStringIO):
-    """StringIO like class which never fails with unicode."""
-    def write(self, s):
-      if isinstance(s, UnicodeType):
-        s = s.encode('utf8', 'repr')
-      originalStringIO.write(self, s)
-  # iHotFix will patch PageTemplate StringIO with
-  iHotfix.iHotfixStringIO = UnicodeSafeStringIO
-except ImportError:
-  pass
+ZopeTestCase.installProduct('iHotfix', quiet=install_product_quiet)
 ZopeTestCase.installProduct('Localizer', quiet=install_product_quiet)
 ZopeTestCase.installProduct('TimerService', quiet=install_product_quiet)