diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
index cef0e09..72451ed 100755
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@@ -28,7 +28,6 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
-PACKAGES=${PACKAGES:-"python3 python3-pyyaml"}
 PYTHON=${PYTHON:-"python3"}
 
 PATTERN1="{'name': 'foo'}
@@ -41,45 +40,34 @@ PATTERN4="a: 1
 b: {c: 3, d: 4}"
 PATTERN5="Hero(name='Welthyr Syxgon', hp=1200, sp=0)"
 
+set -o pipefail
 
 rlJournalStart
     rlPhaseStartSetup
-        rlAssertRpm --all
-        set -o pipefail
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-
         # export python's MAJOR and MINOR version
         rlRun "export $($PYTHON -c \
                 'import sys; print("MAJOR={0} MINOR={1}".format(\
                 sys.version_info[0],sys.version_info[1]))')"
-        rlRun "cp py* $TmpDir"
-        rlRun "pushd $TmpDir"
-
     rlPhaseEnd
 
     rlPhaseStartTest "Running pyyaml_load.py"
-        rlRun "$PYTHON pyyaml_load.py | tee dump.log" 0
-        rlAssertGrep "$PATTERN1" "dump.log"
+        rlRun -s "$PYTHON pyyaml_load.py"
+        rlAssertGrep "$PATTERN1" "$rlRun_LOG"
     rlPhaseEnd
 
     rlPhaseStartTest "Running pyyaml_dump.py"
-        rlRun "$PYTHON pyyaml_dump.py | tee dump.log" 0
-        rlAssertGrep "$PATTERN3" "dump.log"
+        rlRun -s "$PYTHON pyyaml_dump.py"
+        rlAssertGrep "$PATTERN3" "$rlRun_LOG"
     rlPhaseEnd
 
     rlPhaseStartTest "Running pyyaml_parse.py"
-        rlRun "$PYTHON pyyaml_parse.py | tee dump.log" 0
-        rlAssertGrep "$PATTERN4" "dump.log"
+        rlRun -s "$PYTHON pyyaml_parse.py"
+        rlAssertGrep "$PATTERN4" "$rlRun_LOG"
     rlPhaseEnd
 
     rlPhaseStartTest "Running pyyaml_object.py"
-        rlRun "$PYTHON pyyaml_object.py | tee dump.log" 0
-        rlAssertGrep "$PATTERN5" "dump.log"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+        rlRun -s "$PYTHON pyyaml_object.py"
+        rlAssertGrep "$PATTERN5" "$rlRun_LOG"
     rlPhaseEnd
 
 rlJournalPrintText