diff --git a/TESTS_ENVIRONMENT.in b/TESTS_ENVIRONMENT.in
index 7fcea2a6..0d34516b 100644
--- a/TESTS_ENVIRONMENT.in
+++ b/TESTS_ENVIRONMENT.in
@@ -16,6 +16,9 @@ export test_dir
 BZIP2_CMD="@BZIP2_CMD@"
 export BZIP2_CMD
 
+HOME="${top_builddir}/test"
+export HOME
+
 # The full path of the test case
 test_file=$1
 # The base name of the test case
diff --git a/test/Makefile.am b/test/Makefile.am
index 5012ee1b..1be4225e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -253,3 +253,4 @@ DISTCLEANFILES = \
 
 distclean-local:
 	rm -rf sessions
+	rm -rf .lnav
diff --git a/test/Makefile.in b/test/Makefile.in
index 554d24cd..bfe3e5f4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1534,6 +1534,7 @@ simple-db.db: simple-db.sql
 
 distclean-local:
 	rm -rf sessions
+	rm -rf .lnav
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.