diff --git a/gatewayservice/gateway-service.test.js b/gatewayservice/tests/gateway-service.test.js
similarity index 100%
rename from gatewayservice/gateway-service.test.js
rename to gatewayservice/tests/gateway-service.test.js
diff --git a/questionservice/server.test.js b/questionService/tests/server.test.js
similarity index 100%
rename from questionservice/server.test.js
rename to questionService/tests/server.test.js
diff --git a/sonar-project.properties b/sonar-project.properties
index c82b0e5..02fce9d 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -10,10 +10,16 @@ sonar.host.url=https://sonarcloud.io
 sonar.language=js
 sonar.projectName=wiq_es05a
 
+# Sonar exclusions
 sonar.coverage.exclusions=**/*.test.js
 sonar.coverage.exclusions=**/*.json, **/*.yaml
 sonar.coverage.exclusions=**/Dockerfile, **/*.dockerfile
 sonar.coverage.exclusions=webapp/src/components/tests/**
+sonar.coverage.exclusions=userservice/authservice/tests/**
+sonar.coverage.exclusions=userservice/userservice/tests/**
+sonar.coverage.exclusions=questionservice/tests/**
+sonar.coverage.exclusions=gatewayservice/tests/**
+# Sonar sources
 sonar.sources=webapp/src/components,userservice/authservice,userservice/userservice,gatewayservice,questionservice
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=node_modules/**
diff --git a/userservice/authservice/auth-service.test.js b/userservice/authservice/tests/auth-service.test.js
similarity index 100%
rename from userservice/authservice/auth-service.test.js
rename to userservice/authservice/tests/auth-service.test.js
diff --git a/userservice/userservice/user-service.test.js b/userservice/userservice/tests/user-service.test.js
similarity index 100%
rename from userservice/userservice/user-service.test.js
rename to userservice/userservice/tests/user-service.test.js