diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index acfe952c722a1a36fd6fe50338cf49335e4c6699..2e24a14b6615a068ed6d3a7b799c2766f4e1f649 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -199,7 +199,7 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
     }
 
     @Test
-    public void restore_succeeds() throws AmqpException, IOException, InterruptedException {
+    public void restore_succeeds() throws AmqpException, IOException {
 
         /* mock */
         when(tableRepository.findAll())
@@ -207,7 +207,6 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
 
         /* test */
         messageQueueService.restore();
-        Thread.sleep(5 * 1000);
         final List<ConsumerDto> response = rabbitMqConfig.findAllConsumers();
         assertEquals(amqpConfig.getAmqpConsumers(), (int) response.stream().filter(c -> c.getQueue().getName().equals(TABLE_1_QUEUE_NAME)).count());
     }
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index c2cf5c3008a214fa63ec571c527e9248ec7c256a..7034c836a515d8c8f545cf52e3f015ba70625484 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -17,6 +17,7 @@ import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,6 +94,12 @@ public class ViewServiceIntegrationTest extends BaseUnitTest {
         DockerConfig.removeAllNetworks();
     }
 
+    @BeforeEach
+    public void beforeEach() {
+        DATABASE_1.setTables(List.of(TABLE_1, TABLE_2, TABLE_3, TABLE_7));
+        DATABASE_1.setViews(List.of(VIEW_3));
+    }
+
     @Test
     public void create_viewJoinOnView_succeeds() throws DatabaseNotFoundException, UserNotFoundException,
             DatabaseConnectionException, ViewMalformedException, QueryMalformedException, SQLException {