diff --git a/Makefile b/Makefile
index 4fb9ad7..e67d7f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .POSIX:
-.PHONY: test e2etest unittest crontest pre-clean clean
+.PHONY: test e2etest unittest crontest pre-clean clean restore-keyhome
 
 #
 # On systems where Python 3.x binary has a different name, just
@@ -26,7 +26,7 @@ test: e2etest unittest crontest
 # file.  Basically this is just a script that feeds GPG Mailgate with
 # known input and checks whether output meets expectations.
 #
-e2etest: test/tmp test/logs pre-clean
+e2etest: test/tmp test/logs pre-clean restore-keyhome
 	$(PYTHON) test/e2e_test.py
 
 #
@@ -57,6 +57,9 @@ pre-clean:
 	rm -fv test/gpg-mailgate.conf
 	rm -f test/logs/*.log
 
+restore-keyhome:
+	git restore test/keyhome
+
 test/tmp:
 	mkdir test/tmp