--- a/cubicweb/server/test/unittest_rqlannotation.py	Fri Sep 30 18:25:08 2016 +0200
+++ b/cubicweb/server/test/unittest_rqlannotation.py	Thu Oct 06 21:14:49 2016 +0200
@@ -18,14 +18,14 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """unit tests for modules cubicweb.server.rqlannotation"""
 
-from cubicweb.devtools import TestServerConfiguration, get_test_db_handler
+from cubicweb import devtools
 from cubicweb.devtools.repotest import BaseQuerierTC
 
 
 class SQLGenAnnotatorTC(BaseQuerierTC):
 
     def setUp(self):
-        handler = get_test_db_handler(TestServerConfiguration('data', __file__))
+        handler = devtools.get_test_db_handler(devtools.TestServerConfiguration('data', __file__))
         handler.build_db_cache()
         repo, _cnx = handler.get_repo_and_cnx()
         self.__class__.repo = repo