diff --git a/test/Makefile b/test/Makefile
index 13915fe..00d63a1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,9 @@
 RM ?= rm -f
 
 T = main.t bidi.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 cbcb0bd..b6d2bbb 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 ba3995e..58a78a8 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 249ae39..8fd35fe 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_have_prereq PYTHON
 then