diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/AbstractTest.java b/gateleen-test/src/test/java/org/swisspush/gateleen/AbstractTest.java
index c9943666..dd04f701 100755
--- a/gateleen-test/src/test/java/org/swisspush/gateleen/AbstractTest.java
+++ b/gateleen-test/src/test/java/org/swisspush/gateleen/AbstractTest.java
@@ -73,7 +73,6 @@
 import org.swisspush.gateleen.scheduler.SchedulerResourceManager;
 import org.swisspush.gateleen.user.RoleProfileHandler;
 import org.swisspush.gateleen.user.UserProfileHandler;
-import org.swisspush.reststorage.exception.RestStorageExceptionFactory;
 import redis.clients.jedis.Jedis;
 
 import javax.management.*;
@@ -83,7 +82,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.swisspush.reststorage.exception.RestStorageExceptionFactory.newRestStorageWastefulExceptionFactory;
+import static org.swisspush.gateleen.core.exception.GateleenExceptionFactory.newGateleenWastefulExceptionFactory;
 
 /**
  * TestVerticle all Gateleen tests. <br />
@@ -173,7 +172,7 @@ public static void setupBeforeClass(TestContext context) {
                 RoleProfileHandler roleProfileHandler = new RoleProfileHandler(vertx, storage, SERVER_ROOT + "/roles/v1/([^/]+)/profile");
                 qosHandler = new QoSHandler(vertx, storage, SERVER_ROOT + "/admin/v1/qos", props, PREFIX);
 
-                Lock lock = new RedisBasedLock(redisProvider, newRestStorageWastefulExceptionFactory());
+                Lock lock = new RedisBasedLock(redisProvider, newGateleenWastefulExceptionFactory());
 
                 QueueClient queueClient = new QueueClient(vertx, monitoringHandler);
                 ReducedPropagationManager reducedPropagationManager = new ReducedPropagationManager(vertx,