diff --git a/test/feh-bg.i b/test/feh-bg.i
index e7b2f0b978b07598a93e0b34f005a4820baa540f..3624f5cc15c4afd0c69fd13153bef909e1b58285 100755
--- a/test/feh-bg.i
+++ b/test/feh-bg.i
@@ -10,7 +10,7 @@ use Time::HiRes qw/sleep/;
 
 my ($pid_xnest, $pid_twm);
 
-$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+$ENV{HOME} = 'test';
 
 sub set_bg {
 	my ($mode, $file) = @_;
@@ -76,3 +76,4 @@ kill(15, $pid_xnest);
 sleep(0.2);
 
 unlink("/tmp/feh_${$}.png");
+unlink('test/.fehbg');
diff --git a/test/feh-scr.i b/test/feh-scr.i
index 9f6d804efeb8ffbca81805849e41d69ad84e4dc2..9696c9ef620272405f80d3c8ca59f3d2f9296308 100755
--- a/test/feh-scr.i
+++ b/test/feh-scr.i
@@ -16,7 +16,7 @@ my ($width, $height);
 my $pwd = getcwd();
 my $test_id = 0;
 
-$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+$ENV{HOME} = 'test';
 
 sub waitfor(&) {
 	my ($sub) = @_;
diff --git a/test/feh.i b/test/feh.i
index 748d20e4bdd23528017d5b49512e712ca025ab78..ad42732c5c7b9104ab9324f66f77777729ea053a 100755
--- a/test/feh.i
+++ b/test/feh.i
@@ -12,7 +12,7 @@ my $win;
 my ($width, $height);
 my $pwd = getcwd();
 
-$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+$ENV{HOME} = 'test';
 
 sub waitfor(&) {
 	my ($sub) = @_;
diff --git a/test/feh.t b/test/feh.t
index cff34c7dc730d1f53904de5081da91162bd9f248..b08238b72509e467c9eacb78ca70de7ae9e65128 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -4,7 +4,8 @@ use warnings;
 use 5.010;
 use Test::Command tests => 48;
 
-$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+$ENV{HOME} = 'test';
+
 my $feh = "src/feh";
 my $images = 'test/ok/gif test/ok/jpg test/ok/png test/ok/pnm '
            . 'test/fail/gif test/fail/jpg test/fail/png test/fail/pnm';