--- a/server/test/unittest_ldapsource.py	Tue Aug 25 11:09:22 2015 +0200
+++ b/server/test/unittest_ldapsource.py	Thu Aug 06 15:24:16 2015 +0200
@@ -25,8 +25,6 @@
 import subprocess
 import tempfile
 
-from logilab.common.testlib import TestCase, unittest_main, mock_object, Tags
-
 from cubicweb import AuthenticationError
 from cubicweb.devtools.testlib import CubicWebTC
 from cubicweb.devtools.repotest import RQLGeneratorTC
@@ -480,4 +478,5 @@
 
 
 if __name__ == '__main__':
+    from logilab.common.testlib import unittest_main
     unittest_main()

--- a/web/test/unittest_form.py	Tue Aug 25 11:09:22 2015 +0200
+++ b/web/test/unittest_form.py	Thu Aug 06 15:24:16 2015 +0200
@@ -21,7 +21,7 @@
 from xml.etree.ElementTree import fromstring
 from lxml import html
 
-from logilab.common.testlib import unittest_main, mock_object
+from logilab.common.testlib import unittest_main
 
 from cubicweb import Binary, ValidationError
 from cubicweb.devtools.testlib import CubicWebTC