diff --git a/Makefile b/Makefile
index 9c70793..7e6a010 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ build:
 doc: doc/git-remote-hg.1
 
 test:
-	$(MAKE) -C test
+	$(MAKE) -C t
 
 doc/git-remote-hg.1: doc/git-remote-hg.txt
 	asciidoctor -d manpage -b manpage $<
diff --git a/test/.gitignore b/t/.gitignore
similarity index 100%
rename from test/.gitignore
rename to t/.gitignore
diff --git a/test/Makefile b/t/Makefile
similarity index 100%
rename from test/Makefile
rename to t/Makefile
diff --git a/test/bidi.t b/t/bidi.t
similarity index 100%
rename from test/bidi.t
rename to t/bidi.t
diff --git a/test/expected/converged merge/git-log b/t/expected/converged merge/git-log
similarity index 100%
rename from test/expected/converged merge/git-log
rename to t/expected/converged merge/git-log
diff --git a/test/expected/converged merge/hg-log b/t/expected/converged merge/hg-log
similarity index 100%
rename from test/expected/converged merge/hg-log
rename to t/expected/converged merge/hg-log
diff --git a/test/expected/encoding/git-log b/t/expected/encoding/git-log
similarity index 100%
rename from test/expected/encoding/git-log
rename to t/expected/encoding/git-log
diff --git a/test/expected/encoding/hg-log b/t/expected/encoding/hg-log
similarity index 100%
rename from test/expected/encoding/hg-log
rename to t/expected/encoding/hg-log
diff --git a/test/expected/executable bit/log b/t/expected/executable bit/log
similarity index 100%
rename from test/expected/executable bit/log
rename to t/expected/executable bit/log
diff --git a/test/expected/executable bit/output b/t/expected/executable bit/output
similarity index 100%
rename from test/expected/executable bit/output
rename to t/expected/executable bit/output
diff --git a/test/expected/file removal/log b/t/expected/file removal/log
similarity index 100%
rename from test/expected/file removal/log
rename to t/expected/file removal/log
diff --git a/test/expected/file removal/output b/t/expected/file removal/output
similarity index 100%
rename from test/expected/file removal/output
rename to t/expected/file removal/output
diff --git a/test/expected/git tags/log b/t/expected/git tags/log
similarity index 100%
rename from test/expected/git tags/log
rename to t/expected/git tags/log
diff --git a/test/expected/hg author/git-log b/t/expected/hg author/git-log
similarity index 100%
rename from test/expected/hg author/git-log
rename to t/expected/hg author/git-log
diff --git a/test/expected/hg author/hg-log b/t/expected/hg author/hg-log
similarity index 100%
rename from test/expected/hg author/hg-log
rename to t/expected/hg author/hg-log
diff --git a/test/expected/hg branch/git-log b/t/expected/hg branch/git-log
similarity index 100%
rename from test/expected/hg branch/git-log
rename to t/expected/hg branch/git-log
diff --git a/test/expected/hg branch/hg-log b/t/expected/hg branch/hg-log
similarity index 100%
rename from test/expected/hg branch/hg-log
rename to t/expected/hg branch/hg-log
diff --git a/test/expected/hg tags/output b/t/expected/hg tags/output
similarity index 100%
rename from test/expected/hg tags/output
rename to t/expected/hg tags/output
diff --git a/test/expected/merge conflict 1/git-log b/t/expected/merge conflict 1/git-log
similarity index 100%
rename from test/expected/merge conflict 1/git-log
rename to t/expected/merge conflict 1/git-log
diff --git a/test/expected/merge conflict 1/hg-log b/t/expected/merge conflict 1/hg-log
similarity index 100%
rename from test/expected/merge conflict 1/hg-log
rename to t/expected/merge conflict 1/hg-log
diff --git a/test/expected/merge conflict 2/git-log b/t/expected/merge conflict 2/git-log
similarity index 100%
rename from test/expected/merge conflict 2/git-log
rename to t/expected/merge conflict 2/git-log
diff --git a/test/expected/merge conflict 2/hg-log b/t/expected/merge conflict 2/hg-log
similarity index 100%
rename from test/expected/merge conflict 2/hg-log
rename to t/expected/merge conflict 2/hg-log
diff --git a/test/expected/rename/git-log b/t/expected/rename/git-log
similarity index 100%
rename from test/expected/rename/git-log
rename to t/expected/rename/git-log
diff --git a/test/expected/rename/hg-log b/t/expected/rename/hg-log
similarity index 100%
rename from test/expected/rename/hg-log
rename to t/expected/rename/hg-log
diff --git a/test/expected/symlink/log b/t/expected/symlink/log
similarity index 100%
rename from test/expected/symlink/log
rename to t/expected/symlink/log
diff --git a/test/expected/symlink/output b/t/expected/symlink/output
similarity index 100%
rename from test/expected/symlink/output
rename to t/expected/symlink/output
diff --git a/test/helper.t b/t/helper.t
similarity index 100%
rename from test/helper.t
rename to t/helper.t
diff --git a/test/hg-git.t b/t/hg-git.t
similarity index 100%
rename from test/hg-git.t
rename to t/hg-git.t
diff --git a/test/main-push.t b/t/main-push.t
similarity index 100%
rename from test/main-push.t
rename to t/main-push.t
diff --git a/test/main.t b/t/main.t
similarity index 100%
rename from test/main.t
rename to t/main.t
diff --git a/test/sharness.sh b/t/sharness.sh
similarity index 100%
rename from test/sharness.sh
rename to t/sharness.sh
diff --git a/test/test-lib.sh b/t/test-lib.sh
similarity index 100%
rename from test/test-lib.sh
rename to t/test-lib.sh