diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25e8ebe5c18596f784d0428d45e51eb6ee991b07..ed28a72cdc498bfa54f700a2c6d52c4cea308763 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ image: "docker/compose:latest"
 stages:
   - build-backend
   - build-frontend
+  - test-backend
   - build-docker
   - release
 
@@ -90,6 +91,69 @@ build-backend-metadata:
   script:
     - "make build-backend-metadata"
 
+test-backend-authentication:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  script:
+    - "make test-authentication-service"
+
+test-backend-identifier:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  script:
+    - "make test-identifier-service"
+
+test-backend-container:
+  stage: test-backend
+  needs:
+    - build-backend-container
+  script:
+    - "make test-container-service"
+
+test-backend-database:
+  stage: test-backend
+  needs:
+    - build-backend-database
+  script:
+    - "make test-database-service"
+
+test-backend-discovery:
+  stage: test-backend
+  needs:
+    - build-backend-discovery
+  script:
+    - "make test-discovery-service"
+
+test-backend-query:
+  stage: test-backend
+  needs:
+    - build-backend-query
+  script:
+    - "make test-query-service"
+
+test-backend-table:
+  stage: test-backend
+  needs:
+    - build-backend-table
+  script:
+    - "make test-table-service"
+
+test-backend-metadata:
+  stage: test-backend
+  needs:
+    - build-backend-metadata
+  script:
+    - "make test-metadata-service"
+
+test-backend-gateway:
+  stage: test-backend
+  needs:
+    - build-backend-gateway
+  script:
+    - "make test-gateway-service"
+
 build-docker:
   stage: build-docker
   needs:
diff --git a/Makefile b/Makefile
index e70e3e7e5f5cabd61ba5b320ecb19a0c6f06e284..1de82865aa2cd00d37ad3879f346d41ab7cab89b 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ pull-metadata:
 
 test-backend: test-authentication-service 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-backend-auth:
+test-authentication-service:
 	mvn -f ./fda-authentication-service/pom.xml clean test verify
 
 test-identifier-service: