diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 724ed37..0014115 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,5 @@
 on:
   push:
-    branches: [ master ]
 
 jobs:
   test:
diff --git a/test/Makefile b/test/Makefile
index fa16d61..b18b2f1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,9 @@
 RM ?= rm -f
 
 T = main.t main-push.t bidi.t helper.t
-TEST_DIRECTORY := $(CURDIR)
+SHARNESS_TEST_DIRECTORY := $(CURDIR)
 
-export TEST_DIRECTORY
+export SHARNESS_TEST_DIRECTORY
 
 all: test
 
diff --git a/test/bidi.t b/test/bidi.t
index 09cf847..77b0052 100755
--- a/test/bidi.t
+++ b/test/bidi.t
@@ -8,8 +8,7 @@
 
 test_description='Test bidirectionality of remote-hg'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=$(dirname $0)/
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
diff --git a/test/hg-git.t b/test/hg-git.t
index 14d79f1..b6165cc 100755
--- a/test/hg-git.t
+++ b/test/hg-git.t
@@ -8,8 +8,7 @@
 
 test_description='Test remote-hg output compared to hg-git'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=$(dirname $0)/
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
diff --git a/test/main.t b/test/main.t
index 62dc217..76ddac5 100755
--- a/test/main.t
+++ b/test/main.t
@@ -8,8 +8,7 @@
 
 test_description='Test remote-hg'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=$(dirname $0)/
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if test "$CAPABILITY_PUSH" = "t"
 then
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 3206321..2dfb7cc 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
+: "${SHARNESS_TEST_SRCDIR:=$(cd "$(dirname "${BASH_SOURCE-$0}")" && pwd)}"
+
 if [ -z "$SHARNESS" ] ; then
 	for d in \
-		"." \
+		"$SHARNESS_TEST_SRCDIR" \
 		"$HOME/share/sharness" \
 		"/usr/local/share/sharness" \
 		"/usr/share/sharness"