diff --git a/tests/Regression/upstream-testsuite/runtest.sh b/tests/Regression/upstream-testsuite/runtest.sh
index 810849d..421687b 100755
--- a/tests/Regression/upstream-testsuite/runtest.sh
+++ b/tests/Regression/upstream-testsuite/runtest.sh
@@ -40,7 +40,7 @@ _BASEDIR=\$1
 _TMP=\$(mktemp -d)
 rpm --define="_topdir \$_TMP" -Uvh \$_BASEDIR/byacc*.src.rpm
 rpmbuild --define="_topdir \$_TMP" -bc \$_TMP/SPECS/byacc.spec
-pushd \$_TMP/BUILD/byacc-*
+pushd \$(find \$_TMP/BUILD/ -name yacc -type f -exec dirname {} \;)
 # In case the test fails, the existcode of make check is non-zero.
 # In such case this script fails too because of set -e above.
 make check
@@ -56,11 +56,7 @@ rlJournalStart
         rlRun "TMP=\$(mktemp -d)"
 	rlRun "chmod a+rx $TMP"
         rlRun "pushd $TMP"
-	if rlIsRHEL; then
-	    rlFetchSrcForInstalled $PACKAGE
-	else
-	    yumdownloader --source $PACKAGE
-	fi
+        rlFetchSrcForInstalled $PACKAGE
 	rlRun "chmod a+r byacc*.src.rpm"
     rlPhaseEnd