diff --git a/Makefile b/Makefile
index bd25de9c3fe44401f48d192e2327abc2cc4cc66b..05c30f1d8937b5769808a6f29366c1eb6a2e497f 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ release-search: tag-search
 release-metadata: tag-metadata
 	docker push "dbrepo/metadata-service:${TAG}"
 
-test-backend: test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service test-user-service
+test-backend: test-container-service test-database-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service test-user-service
 
 test-identifier-service: clean build-metadata-db build-identifier-service
 	mvn -f ./dbrepo-identifier-service/pom.xml clean test verify
@@ -157,15 +157,9 @@ test-container-service: clean build-metadata-db build-container-service
 	mvn -f ./dbrepo-container-service/pom.xml clean test verify
 
 test-database-service: clean build-metadata-db build-database-service
-	docker pull rabbitmq:3-management-alpine
+	docker pull rabbitmq:3-management-alpine elasticsearch:8.7.1
 	mvn -f ./dbrepo-database-service/pom.xml clean test verify
 
-test-discovery-service: clean build-metadata-db build-discovery-service
-	mvn -f ./dbrepo-discovery-service/pom.xml clean test verify
-
-test-gateway-service: clean build-metadata-db build-gateway-service
-	mvn -f ./dbrepo-gateway-service/pom.xml clean test verify
-
 test-query-service: clean build-metadata-db build-query-service
 	mvn -f ./dbrepo-query-service/pom.xml clean test verify
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java
index ab7659a86f8ebca4b31f6d742758279954636b84..1117c0b9a8f7935e5186113617326c8d5155874f 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java
@@ -8,7 +8,6 @@ import at.tuwien.entities.database.Database;
 import at.tuwien.repository.elastic.DatabaseIdxRepository;
 import at.tuwien.repository.jpa.ContainerRepository;
 import at.tuwien.repository.jpa.DatabaseRepository;
-import at.tuwien.repository.jpa.ImageRepository;
 import at.tuwien.repository.jpa.UserRepository;
 import at.tuwien.service.impl.MariaDbServiceImpl;
 import com.rabbitmq.client.Channel;
@@ -58,9 +57,6 @@ public class DatabaseServiceComponentTest extends BaseUnitTest {
     @Autowired
     private MariaDbServiceImpl databaseService;
 
-    @Autowired
-    private H2Utils h2Utils;
-
     private final static String BIND_MUSICOLOGY = new File("../../dbrepo-metadata-db/test/src/test/resources/musicology").toPath().toAbsolutePath() + ":/docker-entrypoint-initdb.d";
 
     @BeforeAll