diff --git a/src/test/kotlin/functional/MailerTest.kt b/src/test/kotlin/functional/MailerTest.kt
index f6bbb6a..b63d6fc 100644
--- a/src/test/kotlin/functional/MailerTest.kt
+++ b/src/test/kotlin/functional/MailerTest.kt
@@ -22,7 +22,7 @@ import org.koin.test.get
 @KtorExperimentalLocationsAPI
 @KtorExperimentalAPI
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tags(Tag("functional"))
+@Tags(Tag("functional"), Tag("mail"))
 class MailerTest : KoinTest, AutoCloseKoinTest() {
     @InternalCoroutinesApi
     @ExperimentalCoroutinesApi
diff --git a/src/test/kotlin/functional/NotificationConsumerTest.kt b/src/test/kotlin/functional/NotificationConsumerTest.kt
index 85302ab..4d35704 100644
--- a/src/test/kotlin/functional/NotificationConsumerTest.kt
+++ b/src/test/kotlin/functional/NotificationConsumerTest.kt
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.TestInstance
 import org.slf4j.LoggerFactory
 
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
-@Tags(Tag("functional"))
+@Tags(Tag("functional"), Tag("notification"))
 class NotificationConsumerTest {
     companion object {
         @BeforeAll
diff --git a/src/test/kotlin/functional/NotificationsPushTest.kt b/src/test/kotlin/functional/NotificationsPushTest.kt
index 9c266d7..cedbaf6 100644
--- a/src/test/kotlin/functional/NotificationsPushTest.kt
+++ b/src/test/kotlin/functional/NotificationsPushTest.kt
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
-@Tags(Tag("functional"))
+@Tags(Tag("functional"), Tag("notification"))
 internal class NotificationsPushTest {
     companion object {
         @BeforeAll
diff --git a/src/test/kotlin/functional/ResourcesKtTest.kt b/src/test/kotlin/functional/ResourcesKtTest.kt
index 34f3ff4..9f79a1b 100644
--- a/src/test/kotlin/functional/ResourcesKtTest.kt
+++ b/src/test/kotlin/functional/ResourcesKtTest.kt
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.TestInstance
 import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tags(Tag("functional"))
+@Tags(Tag("functional"), Tag("utils"))
 class ResourcesKtTest {
     @Test
     fun readResource() {
diff --git a/src/test/kotlin/functional/ViewTest.kt b/src/test/kotlin/functional/ViewTest.kt
index 2d0de49..d8a74d7 100644
--- a/src/test/kotlin/functional/ViewTest.kt
+++ b/src/test/kotlin/functional/ViewTest.kt
@@ -25,7 +25,7 @@ import java.util.UUID
 @KtorExperimentalAPI
 @ExperimentalCoroutinesApi
 @TestInstance(PER_CLASS)
-@Tags(Tag("functional"))
+@Tags(Tag("functional"), Tag("view"))
 class ViewTest {
     @Test
     fun `test View Article`() {
diff --git a/src/test/kotlin/integration/Opinion routes.kt b/src/test/kotlin/integration/Opinion routes.kt
index 6abc93c..ec8c7dd 100644
--- a/src/test/kotlin/integration/Opinion routes.kt	
+++ b/src/test/kotlin/integration/Opinion routes.kt	
@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tags(Tag("integration"), Tag("article"), Tag("opinion"))
+@Tags(Tag("integration"), Tag("opinion"))
 class `Opinion routes` : BaseTest() {
     @Test
     fun `I can get all opinion choices`() {
@@ -48,6 +48,7 @@ class `Opinion routes` : BaseTest() {
     }
 
     @Test
+    @Tag("article")
     fun `I can create opinion on article`() {
         withIntegrationApplication {
             `Given I have citizen`("Isaac", "Newton", id = "2f414045-95d9-42ca-a3a9-8cdde52ad253")
@@ -89,6 +90,7 @@ class `Opinion routes` : BaseTest() {
     }
 
     @Test
+    @Tag("article")
     fun `I can receive opinion aggregation with article`() {
         withIntegrationApplication {
             `Given I have an opinion choice`("Opinion6")
@@ -120,6 +122,7 @@ class `Opinion routes` : BaseTest() {
     }
 
     @Test
+    @Tag("article")
     fun `I can get all my opinion of one article`() {
         withIntegrationApplication {
             `Given I have citizen`("Albert", "Einstein", id = "c1542096-3431-432d-8e35-9dc071d4c818")
diff --git a/src/test/kotlin/unit/security/Article Access Control.kt b/src/test/kotlin/unit/security/Article Access Control.kt
index c5474d1..bddb1d0 100644
--- a/src/test/kotlin/unit/security/Article Access Control.kt	
+++ b/src/test/kotlin/unit/security/Article Access Control.kt	
@@ -27,7 +27,7 @@ import fr.dcproject.component.article.database.ArticleRepository as ArticleRepo
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("article"))
 internal class `Article Access Control` {
     private val tesla = CitizenCreator(
         id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),
diff --git a/src/test/kotlin/unit/security/Citizen Access Control.kt b/src/test/kotlin/unit/security/Citizen Access Control.kt
index f735b6f..153356c 100644
--- a/src/test/kotlin/unit/security/Citizen Access Control.kt	
+++ b/src/test/kotlin/unit/security/Citizen Access Control.kt	
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("citizen"))
 internal class `Citizen Access Control` {
     private val tesla = CitizenCart(
         user = User(
diff --git a/src/test/kotlin/unit/security/Comment Access Control.kt b/src/test/kotlin/unit/security/Comment Access Control.kt
index 89c2034..e2d9260 100644
--- a/src/test/kotlin/unit/security/Comment Access Control.kt	
+++ b/src/test/kotlin/unit/security/Comment Access Control.kt	
@@ -25,7 +25,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("comment"))
 internal class `Comment Access Control` {
     private val tesla = Citizen(
         user = User(
diff --git a/src/test/kotlin/unit/security/Follow Access Control.kt b/src/test/kotlin/unit/security/Follow Access Control.kt
index d57152a..c093a7e 100644
--- a/src/test/kotlin/unit/security/Follow Access Control.kt	
+++ b/src/test/kotlin/unit/security/Follow Access Control.kt	
@@ -23,7 +23,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("follow"))
 internal class `Follow Access Control` {
     private val tesla = CitizenCreator(
         user = UserCreator(
diff --git a/src/test/kotlin/unit/security/Opinion Access Control.kt b/src/test/kotlin/unit/security/Opinion Access Control.kt
index 8bdd07a..802cdaa 100644
--- a/src/test/kotlin/unit/security/Opinion Access Control.kt	
+++ b/src/test/kotlin/unit/security/Opinion Access Control.kt	
@@ -21,7 +21,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("opinion"))
 internal class `Opinion Access Control` {
     private val tesla = CitizenCreator(
         user = UserCreator(
diff --git a/src/test/kotlin/unit/security/OpinionChoice Access Control.kt b/src/test/kotlin/unit/security/OpinionChoice Access Control.kt
index 5c1b78a..223557b 100644
--- a/src/test/kotlin/unit/security/OpinionChoice Access Control.kt	
+++ b/src/test/kotlin/unit/security/OpinionChoice Access Control.kt	
@@ -15,7 +15,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("opinion"))
 internal class `OpinionChoice Access Control` {
     private val tesla = CitizenRef(
         id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),
diff --git a/src/test/kotlin/unit/security/Vote Access Control.kt b/src/test/kotlin/unit/security/Vote Access Control.kt
index 51dfa6c..e10f69a 100644
--- a/src/test/kotlin/unit/security/Vote Access Control.kt	
+++ b/src/test/kotlin/unit/security/Vote Access Control.kt	
@@ -24,7 +24,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("vote"))
 internal class `Vote Access Control` {
     private val tesla = Citizen(
         id = UUID.fromString("a1e35c99-9d33-4fb4-9201-58d7071243bb"),
diff --git a/src/test/kotlin/unit/security/Workgroup Access Control.kt b/src/test/kotlin/unit/security/Workgroup Access Control.kt
index aedc0ae..a240429 100644
--- a/src/test/kotlin/unit/security/Workgroup Access Control.kt	
+++ b/src/test/kotlin/unit/security/Workgroup Access Control.kt	
@@ -20,7 +20,7 @@ import fr.dcproject.component.workgroup.database.WorkgroupForView as WorkgroupEn
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("security"), Tag("unit"), Tag("workgroup"))
 internal class `Workgroup Access Control` {
     private val tesla = CitizenCreator(
         user = UserCreator(