diff --git a/tests/Sanity/basic-smoke/main.fmf b/tests/Sanity/basic-smoke/main.fmf
index 571d093..4efa91c 100644
--- a/tests/Sanity/basic-smoke/main.fmf
+++ b/tests/Sanity/basic-smoke/main.fmf
@@ -1,5 +1,9 @@
 summary: basic-smoke
-description: 'Compile a basic rust program with rustc and check it runs'
 duration: 10m
+tier: 1
+tag:
+  - CI-Tier-1
+extra-nitrate: TC#0553157
 extra-summary: /tools/rust/Sanity/basic-smoke
 extra-task: /tools/rust/Sanity/basic-smoke
+id: 6e1016b6-80a7-466a-b4fc-c9af9630e700
diff --git a/tests/Sanity/basic-smoke/runtest.sh b/tests/Sanity/basic-smoke/runtest.sh
index ed25e86..8057ea0 100755
--- a/tests/Sanity/basic-smoke/runtest.sh
+++ b/tests/Sanity/basic-smoke/runtest.sh
@@ -29,10 +29,11 @@
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="$(rpm -qf $(which rustc))"
+PACKAGES=${PACKAGES:-$PACKAGE}
 
 rlJournalStart
     rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
+        rlAssertRpm --all
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
     rlPhaseEnd
@@ -51,5 +52,4 @@ rlJournalStart
         rlRun "popd"
         rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
     rlPhaseEnd
-rlJournalPrintText
 rlJournalEnd
diff --git a/tests/Sanity/rpm-rebuild/librsvg2.fmf b/tests/Sanity/rpm-rebuild/librsvg2.fmf
index 35e4df4..52b81b5 100644
--- a/tests/Sanity/rpm-rebuild/librsvg2.fmf
+++ b/tests/Sanity/rpm-rebuild/librsvg2.fmf
@@ -3,9 +3,16 @@ require+:
   - librsvg2
 environment+:
   PKG_TO_BUILD: "librsvg2"
-duration: 20m
+duration: 1h
+tier: 1
+tag+:
+  - rhel-buildroot
 
 adjust+:
   # building librsvg2 in Fedora is very flaky. Do not run it there
   - when: distro == fedora
     enabled: false
+
+  - enabled: false
+    when: distro < rhel-8
+    continue: false
diff --git a/tests/Sanity/rpm-rebuild/stratisd.fmf b/tests/Sanity/rpm-rebuild/stratisd.fmf
index 64cce60..99189b3 100644
--- a/tests/Sanity/rpm-rebuild/stratisd.fmf
+++ b/tests/Sanity/rpm-rebuild/stratisd.fmf
@@ -4,3 +4,14 @@ require+:
 environment+:
   PKG_TO_BUILD: "stratisd"
 duration: 1h
+tier: 1
+
+tag:
+  - rhel-buildroot
+adjust+:
+  - enabled: false
+    when: distro < rhel-8
+    continue: false
+  - enabled: false
+    when: distro == rhel-8 and distro >= rhel-8.9
+    continue: false
diff --git a/tests/Sanity/rust-wasm-smoke-test/main.fmf b/tests/Sanity/rust-wasm-smoke-test/main.fmf
index 47ca3f1..fb79999 100644
--- a/tests/Sanity/rust-wasm-smoke-test/main.fmf
+++ b/tests/Sanity/rust-wasm-smoke-test/main.fmf
@@ -1,9 +1,25 @@
-summary: Test that the rust wasm target is enabled and can compile correctly
-description: ''
+summary: rust wasm smoke test
+description: 'Test that the rust wasm target is enabled and can compile correctly'
 require+:
-  - rust
   - rust-std-static-wasm32-unknown-unknown
   - nodejs
 duration: 5m
+tier: 1
+tag:
+  - CI-Tier-1
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1954872
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1954871
+adjust+:
+  - because: "WASM target not supported in s390x"
+    enabled: false
+    when: arch == s390x
+    continue: false
+  - because: "WASM target not shipped in RHEL older than 8"
+    enabled: false
+    when: distro < rhel-8
+    continue: false
+extra-nitrate: TC#0611164
 extra-summary: /tools/rust/Sanity/rust-wasm-smoke-test
 extra-task: /tools/rust/Sanity/rust-wasm-smoke-test
+id: ac66ace8-6c88-4d2b-b4e5-6d5d86581089
diff --git a/tests/Sanity/rust-wasm-smoke-test/runtest.sh b/tests/Sanity/rust-wasm-smoke-test/runtest.sh
index 7f325c2..2de8b84 100755
--- a/tests/Sanity/rust-wasm-smoke-test/runtest.sh
+++ b/tests/Sanity/rust-wasm-smoke-test/runtest.sh
@@ -48,5 +48,4 @@ rlJournalStart
         rlRun "popd"
         rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
     rlPhaseEnd
-rlJournalPrintText
 rlJournalEnd