Submitted upstream: https://github.com/ibus/ibus-anthy/pull/35

diff --git a/tests/test-build.sh b/tests/test-build.sh
index e83b78f..bbfa7e1 100755
--- a/tests/test-build.sh
+++ b/tests/test-build.sh
@@ -63,26 +63,33 @@ parse_args()
     done;
 }
 
+maybe_install_pycotap() {
+    # Red Hat specific hint.
+    if test -f /etc/redhat-release ; then
+        if ! rpm -q --quiet python3-pycotap; then
+            echo "Please install python3-pycotap"
+            exit -1
+        fi
+    fi;
+
+    # Check if pycotap is already available.
+    if ! python3 -m pycotap >/dev/null; then
+        echo "pycotap not found; installing via pip"
+        if ! pip install pycotap --user; then
+            echo "failed to install pycotap"
+            exit -1
+        fi
+    fi
+}
+
 init_environment()
 {
     if test x$FORCE_TEST != x ; then
         RUN_ARGS="$RUN_ARGS --force";
     fi;
-    HAS_TAP=0;
-    if test -f /etc/redhat-release ; then
-        rpm -q --quiet python3-pycotap
-        if test $? -ne 0 ; then
-            echo "Not found python3-pycotap";
-            exit -1;
-	fi;
-        HAS_TAP=1;
-    fi;
-    TAP_DIR=`python -m site --user-site`/pycotap;
-    if test $HAS_TAP -ne 1 && \
-       test x"$TAP_DIR" != x && test ! -d "$TAP_DIR" ; then
-            echo "pip install pycotap --user";
-            pip install pycotap --user;
-    fi;
+
+    maybe_install_pycotap
+
     if test ! -f $BUILDDIR/../data/$ANTHY_SCHEMA_FILE ; then
         echo "Not found $BUILDDIR/../data/$ANTHY_SCHEMA_FILE";
         exit -1;
0e3d1133ec29242e70fca1d2997a'>commit</a><a href='/guix/diff/gnu/packages/patches/netsurf-longer-test-timeout.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/netsurf-longer-test-timeout.patch'>
<input type='hidden' name='id' value='ab9f9b582e510e3d1133ec29242e70fca1d2997a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>root</a>/<a href='/guix/log/gnu?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>gnu</a>/<a href='/guix/log/gnu/packages?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>patches</a>/<a href='/guix/log/gnu/packages/patches/netsurf-longer-test-timeout.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>netsurf-longer-test-timeout.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/netsurf-longer-test-timeout.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>