diff --git a/core/Ability-to-generate-3072-bit-keys/main.fmf b/core/Ability-to-generate-3072-bit-keys/main.fmf
index 1be41d1..63557e6 100644
--- a/core/Ability-to-generate-3072-bit-keys/main.fmf
+++ b/core/Ability-to-generate-3072-bit-keys/main.fmf
@@ -1,6 +1,7 @@
 summary: Ability to generate 3072 bit keys
 description: |
     Bug summary: Ability to generate 3072 bit keys
+contact: Branislav Náter <bnater@redhat.com>
 component:
   - sscg
 test: ./runtest.sh
diff --git a/core/certificates-with-incorrect-expiry/main.fmf b/core/certificates-with-incorrect-expiry/main.fmf
index 98bfaa6..98702fa 100644
--- a/core/certificates-with-incorrect-expiry/main.fmf
+++ b/core/certificates-with-incorrect-expiry/main.fmf
@@ -10,8 +10,8 @@ recommend:
 duration: 5m
 enabled: true
 tag:
-  - Tier2
-tier: '2'
+  - Tier3
+tier: '3'
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2017667
 extra-nitrate: TC#0612550
diff --git a/core/certificates-with-incorrect-expiry/runtest.sh b/core/certificates-with-incorrect-expiry/runtest.sh
index c54e8a7..3789451 100755
--- a/core/certificates-with-incorrect-expiry/runtest.sh
+++ b/core/certificates-with-incorrect-expiry/runtest.sh
@@ -44,9 +44,9 @@ rlJournalStart
         rlLogInfo "Get current date +1 year"
         # It might happend date we get time a bit later so we will compare
         # certificate date with two values
-        date +'notAfter=%b %-d %H:%M:%S %Y GMT' --utc --date='365 days' > output.txt
-        date +'notAfter=%b %-d %H:%M:%S %Y GMT' --utc --date='365 days - 1 second' >> output.txt
-        cert_end_date=$(openssl x509 -enddate -noout < service.pem | tr -s ' ')
+        date +'notAfter=%b %-d %H:%M:%S %Y GMT' --utc --date='1 year' > output.txt
+        date +'notAfter=%b %-d %H:%M:%S %Y GMT' --utc --date='1 year - 1 second' >> output.txt
+        cert_end_date=$(openssl x509 -enddate -noout < service.pem)
         rlRun "echo $cert_end_date" 0 "Certificate end date"
         rlRun "cat output.txt" 0 "Generated dates"
         # dates should match
diff --git a/main.fmf b/main.fmf
deleted file mode 100644
index 8df2dbd..0000000
--- a/main.fmf
+++ /dev/null
@@ -1,2 +0,0 @@
-# QE owner
-contact: Branislav Náter <bnater@redhat.com>