diff --git a/git-interface/test/Makefile b/test/Makefile
similarity index 100%
rename from git-interface/test/Makefile
rename to test/Makefile
diff --git a/git-interface/test/setup.sh b/test/setup.sh
similarity index 99%
rename from git-interface/test/setup.sh
rename to test/setup.sh
index 0995f053..232b14dc 100644
--- a/git-interface/test/setup.sh
+++ b/test/setup.sh
@@ -1,5 +1,5 @@
 TEST_DIRECTORY="$(pwd)"
-TOPLEVEL="$(cd ../.. && pwd)"
+TOPLEVEL="$(cd .. && pwd)"
 
 . ./sharness.sh
 
diff --git a/git-interface/test/sharness.sh b/test/sharness.sh
similarity index 100%
rename from git-interface/test/sharness.sh
rename to test/sharness.sh
diff --git a/git-interface/test/t0001-auth.sh b/test/t1100-git-auth.sh
similarity index 100%
rename from git-interface/test/t0001-auth.sh
rename to test/t1100-git-auth.sh
diff --git a/git-interface/test/t0002-serve.sh b/test/t1200-git-serve.sh
similarity index 100%
rename from git-interface/test/t0002-serve.sh
rename to test/t1200-git-serve.sh
diff --git a/git-interface/test/t0003-update.sh b/test/t1300-git-update.sh
similarity index 100%
rename from git-interface/test/t0003-update.sh
rename to test/t1300-git-update.sh