diff --git a/policycoreutils/load_policy/runtest.sh b/policycoreutils/load_policy/runtest.sh
index eaa5bac..f71e1e6 100755
--- a/policycoreutils/load_policy/runtest.sh
+++ b/policycoreutils/load_policy/runtest.sh
@@ -48,9 +48,9 @@ rlJournalStart
             sleep 1
         fi
         rlRun "AUDIT_FILE=$(mktemp)"
-	rlRun "auditctl -l | tee -a $AUDIT_FILE" 0 "Save current audit rules"
+        rlRun "auditctl -l | tee -a $AUDIT_FILE" 0 "Save current audit rules"
         rlRun "auditctl -D" 0
-	rlRun "auditctl -w $AUDIT_FILE -p w" 0 \
+        rlRun "auditctl -w $AUDIT_FILE -p w" 0 \
 	    "Enable creation of PATH audit records"
     rlPhaseEnd
 
@@ -94,7 +94,7 @@ rlJournalStart
     rlPhaseStartCleanup
         rlRun "auditctl -W $AUDIT_FILE -p w" 0 \
               "Remove rule for creation of PATH audit records"
-	rlRun "auditctl -R $AUDIT_FILE" 0 "Restore audit rules"
+        rlRun "auditctl -R $AUDIT_FILE" 0,1 "Restore audit rules"
         rlRun "rm -f \"\$AUDIT_FILE\""
     rlPhaseEnd
 rlJournalPrintText
diff --git a/policycoreutils/setsebool/runtest.sh b/policycoreutils/setsebool/runtest.sh
index 04040d1..202d641 100755
--- a/policycoreutils/setsebool/runtest.sh
+++ b/policycoreutils/setsebool/runtest.sh
@@ -48,6 +48,12 @@ rlJournalStart
 
         rlRun "useradd ${USER_NAME}"
         rlRun "echo ${USER_SECRET} | passwd --stdin ${USER_NAME}"
+        rlRun "AUDIT_FILE=$(mktemp)"
+        rlRun "auditctl -l | tee -a $AUDIT_FILE" 0 "Save current audit rules"
+        rlRun "auditctl -D" 0
+        rlRun "auditctl -w $AUDIT_FILE -p w" 0 \
+	    "Enable creation of PATH audit records"
+
     rlPhaseEnd
 
     rlPhaseStartTest
@@ -145,6 +151,10 @@ rlJournalStart
     rlPhaseStartCleanup
         rlRun "userdel -rf ${USER_NAME}"
         rm -f ${OUTPUT_FILE}
+        rlRun "auditctl -W $AUDIT_FILE -p w" 0 \
+              "Remove rule for creation of PATH audit records"
+        rlRun "auditctl -R $AUDIT_FILE" 0,1 "Restore audit rules"
+        rlRun "rm -f \"\$AUDIT_FILE\""
     rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd