diff --git a/Sanity/Basic-sanity-test-for-libarchive/runtest.sh b/Sanity/Basic-sanity-test-for-libarchive/runtest.sh
index dfbca4e..fcd126a 100755
--- a/Sanity/Basic-sanity-test-for-libarchive/runtest.sh
+++ b/Sanity/Basic-sanity-test-for-libarchive/runtest.sh
@@ -73,15 +73,18 @@ rlJournalStart
 
         rlRun "pushd ~/rpmbuild/BUILD/libarchive-*"
         if [ -d ~/rpmbuild/BUILD/libarchive-* ]; then
+	    # This is the workaround to the RPM_ARCH not defined fail due to the package-notes dependency
+	    # More in this thread: https://lists.fedorahosted.org/archives/list/devel@lists.fedoraproject.org/thread/UHJGLOXDDDRTHG4SC5P5FDF37OAMNRDH/
+	    rlRun 'eval "$(rpm --eval %___build_pre)"; cd ~/rpmbuild/BUILD/libarchive-*' 0 "setting environment"
             rlRun "make &> $TmpDir/make.log" 0-255 "Make."
             # CVE-2021-31566 https://bugzilla.redhat.com/show_bug.cgi?id=2026828#c5
             if [[ "$(rlGetArch)" == "s390x" ]]; then
-                rlRun "make check &> $TmpDir/make_check.log" 0,2 "Make check"
+                rlRun "make check &> $TmpDir/make_check.log || cat $TmpDir/make_check.log" 0,2 "Make check"
                 rlRun -s "./libarchive_test" 0,1
                 rlAssertGrep "Tests failed:[[:blank:]]* 1" $rlRun_LOG
 		rlAssertGrep "test_write_filter_gzip (1 failures)" $rlRun_LOG
             else
-                rlRun "make check &> $TmpDir/make_check.log" 0 "Make check"
+                rlRun "make check &> $TmpDir/make_check.log || cat $TmpDir/make_check.log" 0 "Make check"
                 rlRun -s "./libarchive_test"
                 rlAssertGrep "Tests failed:[[:blank:]]* 0" $rlRun_LOG
             fi