diff --git a/product/ERP5Type/tests/testCookieCrumbler.py b/product/ERP5Type/tests/testCookieCrumbler.py
index da9021e6e44466703fa9661d30faf4911c790222..f4f67e684fc686f1afcb4907edd867c1885f57ed 100644
--- a/product/ERP5Type/tests/testCookieCrumbler.py
+++ b/product/ERP5Type/tests/testCookieCrumbler.py
@@ -27,8 +27,12 @@ from ZPublisher.HTTPResponse import HTTPResponse
 from Products.CMFCore.CookieCrumbler \
      import CookieCrumbler, manage_addCC, Redirect
 
-from Products.CMFCore.tests.testCookieCrumbler import makerequest
-from Products.CMFCore.tests.testCookieCrumbler import CookieCrumblerTests
+try:
+  from Products.CMFCore.tests.testCookieCrumbler import makerequest
+  from Products.CMFCore.tests.testCookieCrumbler import CookieCrumblerTests
+except ImportError:
+  from Products.CMFCore.tests.test_CookieCrumbler import makerequest
+  from Products.CMFCore.tests.test_CookieCrumbler import CookieCrumblerTests
 
 class ERP5CookieCrumblerTests (CookieCrumblerTests):
   """ Modify original CMFCore Cookie Crumbler unit test to test long login """