diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
index ddf7ba6..ba932b1 100755
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@@ -3,23 +3,33 @@
 
 rlJournalStart
     rlPhaseStartSetup
+        rlShowPackageVersion ibus-m17n
+        rlRun -t -l "VERSION=$(rpm -q ibus-m17n --queryformat='%{version}')" 0 "Get VERSION"
+        FEDORA_VERSION=$(rlGetDistroRelease)
+        rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
         rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
         rlRun "pushd $tmp"
         rlFetchSrcForInstalled "ibus-m17n"
         rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
-        rlRun "mkdir BUILD" 0 "Creating BUILD directory"
-        rlRun "rpmbuild --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
-        rlRun "pushd BUILD/ibus-m17n*"
+        rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
+        rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
+        if [ ${FEDORA_VERSION} -le "40" ]; then
+            rlRun -t -l "pushd BUILD/ibus-m17n-${VERSION}"
+        else
+            rlRun -t -l "pushd BUILD/ibus-m17n-${VERSION}-build/ibus-m17n-${VERSION}"
+        fi
         rlRun "set -o pipefail"
-        rlRun "NOCONFIGURE=1 ./autogen.sh"
-        rlRun "./configure --disable-static --with-gtk=3.0"
-        rlRun "make check"
+        rlRun -t -l "NOCONFIGURE=1 ./autogen.sh"
+        rlRun -t -l "./configure --disable-static --with-gtk=3.0"
+        rlRun -t -l "make check"
         rlAssertRpm "ibus"
         rlAssertRpm "m17n-db"
     rlPhaseEnd
 
     rlPhaseStartTest
-        rlRun "ibus-daemon -v -r -d"
+        # The -s option and & is important, when using the -d option
+        # in this test environment the error “Can't connect to IBus.” occurs.
+        rlRun -t -l "ibus-daemon -v -r -s &"
         rlRun "sleep 5" 0 "Give ibus-daemon some time to start properly."
         for name in \
             am:sera \
@@ -111,7 +121,7 @@ rlJournalStart
             or:phonetic \
             pa:anmollipi \
             pa:inscript \
-            pa:inscript2 \
+            pa:inscript2-guru \
             pa:itrans \
             pa:jhelum \
             pa:phonetic \
@@ -173,9 +183,9 @@ rlJournalStart
             vi:vni \
             yi:yivo
         do
-            rlRun "/usr/libexec/ibus-engine-m17n --xml 2>/dev/null | grep '<name>m17n:${name}</name>'" \
+            rlRun -t -l "/usr/libexec/ibus-engine-m17n --xml 2>/dev/null | grep '<name>m17n:${name}</name>'" \
                 0 "checking whether 'ibus-engine-m17n --xml' can list m17n:${name}:"
-            rlRun "ibus list-engine --name-only | grep 'm17n:${name}$'" \
+            rlRun -t -l "ibus list-engine --name-only | grep 'm17n:${name}$'" \
                 0 "checking whether ibus can list m17n:${name}:"
         done
     rlPhaseEnd