diff --git a/tests/inplace-upgrade-sanity/TC#0378369.fmf b/tests/inplace-upgrade-sanity/TC#0378369.fmf
deleted file mode 100644
index 8d54d68..0000000
--- a/tests/inplace-upgrade-sanity/TC#0378369.fmf
+++ /dev/null
@@ -1,21 +0,0 @@
-tag:
-  - CI-Tier-1
-  - CI-Tier-1-krb5
-  - Fedora 31
-  - Fedora 32
-  - FedoraReady
-  - IDM-CI-gating
-  - NoRHEL4
-  - NoRHEL5
-  - TIPpass
-  - TIPpass_Security
-  - Tier1
-  - Tier1security
-  - rhel_upgrade
-tier: '1'
-adjust:
-  - enabled: false
-    when: distro == rhel-4, rhel-5
-    continue: false
-extra-nitrate: TC#0378369
-extra-summary: /CoreOS/krb5/Sanity/inplace-upgrade-sanity-test
diff --git a/tests/inplace-upgrade-sanity/TC#0552039.fmf b/tests/inplace-upgrade-sanity/TC#0552039.fmf
deleted file mode 100644
index 7f2731d..0000000
--- a/tests/inplace-upgrade-sanity/TC#0552039.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1394908
-tag:
-  - NoRHEL4
-  - NoRHEL5
-  - TIPpass
-  - TIPpass_Security
-  - Tier2
-tier: '2'
-adjust:
-  - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6
-    continue: false
-environment:
-    TEST_ENTROPY_SOURCE: yes
-extra-nitrate: TC#0552039
-extra-summary: 'BZ#1394908: Enable faster getrandom-based entropy system'
diff --git a/tests/inplace-upgrade-sanity/TC#0608992.fmf b/tests/inplace-upgrade-sanity/TC#0608992.fmf
deleted file mode 100644
index 440308f..0000000
--- a/tests/inplace-upgrade-sanity/TC#0608992.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
-tag:
-  - Fedora 31
-  - Fedora 32
-  - FedoraReady
-  - NoRHEL4
-  - NoRHEL5
-  - rhel_upgrade
-adjust:
-  - enabled: false
-    when: distro == rhel-4, rhel-5
-    continue: false
-manual: true
-extra-nitrate: TC#0608992
-extra-summary: /CoreOS/krb5/Sanity/inplace-upgrade-sanity-test-manual
diff --git a/tests/inplace-upgrade-sanity/main.fmf b/tests/inplace-upgrade-sanity/main.fmf
index 40e0a0e..6c9786c 100644
--- a/tests/inplace-upgrade-sanity/main.fmf
+++ b/tests/inplace-upgrade-sanity/main.fmf
@@ -7,6 +7,7 @@ test: ./runtest.sh
 path: /tests/inplace-upgrade-sanity
 framework: beakerlib
 require:
+- audit-rules
 - expect
 - krb5-server
 - krb5-workstation
diff --git a/tests/inplace-upgrade-sanity/runtest.sh b/tests/inplace-upgrade-sanity/runtest.sh
index b9ad6fc..2715a64 100755
--- a/tests/inplace-upgrade-sanity/runtest.sh
+++ b/tests/inplace-upgrade-sanity/runtest.sh
@@ -140,24 +140,7 @@ fi
   $krb5REALM2 = .
  }
 _EOF
-        # BZ#1394908: Test the entropy source (not relevant for RHEL6)
-        if ! rlIsRHEL 6 && [[ $TEST_ENTROPY_SOURCE == 'yes' ]]; then
-            rlLog "BZ#1394908: The source of entropy will be tested as well"
-            # Check number of audit rules
-            number_rules=$(auditctl -l | grep -v "No rules" | wc -l)
-            if [[ ${number_rules} -ne 0 ]];then
-                truncate -s0 /var/log/audit/audit.log
-                rlRun "auditctl -D" 0 "Delete previous audit rules"
-            fi
-            START_DATE=`date +%H:%M:%S`
-            echo START_DATE=$START_DATE
-            sleep 1
-            rlRun "auditctl -w /dev/random -p rwxa -k RAND"
-            auditctl -l
-            sleep 5
-            rlRun "ausearch -i -k RAND -ts $START_DATE"
-        fi
-        
+
         echo "-----/etc/krb5.conf----"; cat /etc/krb5.conf
         echo "-----/var/kerberos/krb5kdc/kdc.conf-----"; cat /var/kerberos/krb5kdc/kdc.conf
 
@@ -336,18 +319,6 @@ _EOF
         rlRun "kdestroy"
     rlPhaseEnd
 
-    # BZ#1394908: Test the entropy source (not relevant for RHEL6)
-    if ! rlIsRHEL 6 && [[ $TEST_ENTROPY_SOURCE == 'yes' ]]; then
-        rlPhaseStartTest "BZ#1394908: Enable faster getrandom-based entropy system"
-            echo START_DATE=$START_DATE
-            auditctl -l
-            sleep 5 
-            rlRun "ausearch -i -k RAND -ts $START_DATE"
-            rlRun "ausearch -i -k RAND -ts $START_DATE |grep comm= | grep -v comm=auditctl |grep -v 'comm=rngd'" 1
-            rlRun "auditctl -D"
-        rlPhaseEnd
-    fi
-
     # Run this part on "normal" mode; in inplace upgrade no cleanup is needed
     if [[ -z $IN_PLACE_UPGRADE ]]; then
     rlPhaseStartCleanup "KDC and kadmind cleanup"