--- a/cubicweb/test/unittest_cwconfig.py	Fri Jan 20 18:17:04 2017 +0100
+++ b/cubicweb/test/unittest_cwconfig.py	Mon Jan 23 15:35:19 2017 +0100
@@ -241,7 +241,8 @@
         from cubes import mycube
         self.assertEqual(mycube.__path__, [join(self.custom_cubes_dir, 'mycube')])
         # file cube should be overriden by the one found in data/cubes
-        if sys.modules.pop('cubes.file', None) and PY3:
+        sys.modules.pop('cubes.file')
+        if hasattr(cubes, 'file'):
             del cubes.file
         from cubes import file
         self.assertEqual(file.__path__, [join(self.custom_cubes_dir, 'file')])