--- a/cubicweb/test/unittest_rqlrewrite.py	Fri Sep 30 18:25:08 2016 +0200
+++ b/cubicweb/test/unittest_rqlrewrite.py	Thu Oct 06 21:14:49 2016 +0200
@@ -24,14 +24,14 @@
 from yams.buildobjs import RelationDefinition
 from rql import parse, nodes, RQLHelper
 
-from cubicweb import Unauthorized, rqlrewrite
+from cubicweb import Unauthorized, rqlrewrite, devtools
 from cubicweb.schema import RRQLExpression, ERQLExpression
-from cubicweb.devtools import repotest, TestServerConfiguration, BaseApptestConfiguration
+from cubicweb.devtools import repotest
 
 
 def setUpModule(*args):
     global rqlhelper, schema
-    config = TestServerConfiguration('data-rewrite', __file__)
+    config = devtools.TestServerConfiguration('data-rewrite', __file__)
     config.bootstrap_cubes()
     schema = config.load_schema()
     schema.add_relation_def(RelationDefinition(subject='Card', name='in_state',