diff --git a/tests/upstream-testsuite-execution-and-rebuild-test/runtest.sh b/tests/upstream-testsuite-execution-and-rebuild-test/runtest.sh
index f04647c..b6ab75a 100755
--- a/tests/upstream-testsuite-execution-and-rebuild-test/runtest.sh
+++ b/tests/upstream-testsuite-execution-and-rebuild-test/runtest.sh
@@ -66,10 +66,11 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest
-        rlRun "QA_RPATHS=0x0002 rpmbuild -ba ${_SPEC_DIR}/${PACKAGE}.spec" 0 "Test: Rebuild of source '${PACKAGE}' package"
+        rlRun "QA_RPATHS=0x0002 rpmbuild -ba --noclean ${_SPEC_DIR}/${PACKAGE}.spec" 0 "Test: Rebuild of source '${PACKAGE}' package"
         rlGetPhaseState
         if [ $? -eq 0 ]; then
-            cd ${_BUILD_DIR}/${PACKAGE}-*
+            VERSION=$(rpm -q ${PACKAGE} --qf="%{version}")
+            cd ${_BUILD_DIR}/${PACKAGE}-${VERSION}
             rlRun -s "make check" 0 "Test: Upstream testsuite"
             cd ${TmpDir}
             while read -r I; do