diff --git a/Sanity/Master-server-chrooted-reverse-lookup/main.fmf b/Sanity/Master-server-chrooted-reverse-lookup/main.fmf
index c1069fc..1e4cadc 100644
--- a/Sanity/Master-server-chrooted-reverse-lookup/main.fmf
+++ b/Sanity/Master-server-chrooted-reverse-lookup/main.fmf
@@ -10,4 +10,4 @@ relevancy: |
     distro > rhel-6 && product != rhscl: False
 summary: Set up master nameserver in chrooted env, test it.
 test: make run
-tier: 1
+tag: [chroot, bind-setup]
diff --git a/Sanity/Master-server-chrooted/main.fmf b/Sanity/Master-server-chrooted/main.fmf
index ee43256..e0c953f 100644
--- a/Sanity/Master-server-chrooted/main.fmf
+++ b/Sanity/Master-server-chrooted/main.fmf
@@ -10,3 +10,4 @@ relevancy: |
     distro > rhel-6 && product != rhscl: False
 summary: Set up master nameserver in chrooted env, test it.
 test: make run
+tag: [chroot]
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf b/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf
index 90a8ad5..96438ad 100644
--- a/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf
@@ -9,3 +9,4 @@ duration: 150m
 relevancy: ''
 summary: Set up master nameserver, test it.
 test: make run
+tag: [bind-setup]
diff --git a/Sanity/Master-server-not-chrooted/main.fmf b/Sanity/Master-server-not-chrooted/main.fmf
index ed9d35c..2c8366b 100644
--- a/Sanity/Master-server-not-chrooted/main.fmf
+++ b/Sanity/Master-server-not-chrooted/main.fmf
@@ -9,4 +9,4 @@ duration: 90m
 relevancy: ''
 summary: Set up master nameserver in chrooted env, test it.
 test: make run
-tier: 1
+tag: [bind-setup]
diff --git a/Sanity/Run-internal-BIND-test-suite/main.fmf b/Sanity/Run-internal-BIND-test-suite/main.fmf
index c2228ca..cb9f0f6 100644
--- a/Sanity/Run-internal-BIND-test-suite/main.fmf
+++ b/Sanity/Run-internal-BIND-test-suite/main.fmf
@@ -8,5 +8,5 @@ duration: 8h
 relevancy: ''
 summary: Run internal BIND test suite
 test: make run
-tag: [slow]
+tag: [slow, source, rebuild]
 tier: 2
diff --git a/Sanity/rndc-and-pkcs11/main.fmf b/Sanity/rndc-and-pkcs11/main.fmf
index 2e463a1..10bb696 100644
--- a/Sanity/rndc-and-pkcs11/main.fmf
+++ b/Sanity/rndc-and-pkcs11/main.fmf
@@ -9,3 +9,4 @@ relevancy: |
 summary: rndc-and-pkcs11
 test: make run
 tier: 1
+tag: [pkcs11]