diff --git a/Sanity/upstream-scripttests/runtest.sh b/Sanity/upstream-scripttests/runtest.sh
index 8564527..d00a727 100755
--- a/Sanity/upstream-scripttests/runtest.sh
+++ b/Sanity/upstream-scripttests/runtest.sh
@@ -85,7 +85,11 @@ rlJournalStart
         rlRun "mkdir BUILD"                                0 "Creating BUILD directory"
         rlRun "rpmbuild --nodeps --define '_topdir $TmpDir' -bp $TmpDir/SPECS/*spec" \
                                                            0 "Preparing sources"
-        rm -rf BUILD/*SPECPARTS
+        if rlIsFedora || rlIsRHELLike '>9'
+        then
+            rlRun "rm -rf BUILD/*SPECPARTS &> /dev/null" 0,1 "Remove the additional directory if exists"
+        fi
+        rlRun "ls -lah BUILD"
         rlRun "cd BUILD/vim*"
         rlRun "chown -R $TESTER.$TESTER $TmpDir"           0 "Setting permissions"
         rlRun "export LANG=en_US.UTF-8"                    0 "Setting \$LANG to US locale"
diff --git a/Sanity/upstream-unittests/runtest.sh b/Sanity/upstream-unittests/runtest.sh
index d2d9794..f7e0d7f 100755
--- a/Sanity/upstream-unittests/runtest.sh
+++ b/Sanity/upstream-unittests/runtest.sh
@@ -62,6 +62,7 @@ rlJournalStart
         rlRun "rpmbuild --nodeps --define '_topdir $TmpDir' -bp $TmpDir/SPECS/*spec" \
                                                            0 "Preparing sources"
         rm -rf BUILD/*SPECPARTS
+        ls -lahR BUILD/
         rlRun "cd BUILD/vim*"
         rlRun "chown -R $TESTER.$TESTER $TmpDir"           0 "Setting permissions"
         rlRun "export LANG=en_US.UTF-8"                    0 "Setting \$LANG to US locale"