diff --git a/tools/git-if-needed/tests/gifn-test.pl b/tools/git-if-needed/tests/gifn-test.pl
index 7684468..dc8fe58 100755
--- a/tools/git-if-needed/tests/gifn-test.pl
+++ b/tools/git-if-needed/tests/gifn-test.pl
@@ -220,12 +220,23 @@
 	return @{$expected} == @{$got} && all { $expected->[$_] eq $got->[$_] } 0..$#{$expected};
 }
 
+sub git_init($)
+{
+	my ($cfg) = @_;
+
+	run_command @{$cfg->{git}}, 'init';
+	run_command @{$cfg->{git}}, 'config', '--local',
+	    'user.name', 'Somebody';
+	run_command @{$cfg->{git}}, 'config', '--local',
+	    'user.email', 'someone@example.com';
+}
+
 sub setup_repo($)
 {
 	my ($cfg) = @_;
 
 	chdir $cfg->{repo} or die "Could not change into $cfg->{repo}: $!\n";
-	run_command @{$cfg->{git}}, 'init';
+	git_init $cfg;
 	git_status_ok $cfg;
 
 	while (my ($short, $fname) = each %{PATCHFILES->{all}}) {
@@ -372,7 +383,7 @@
 		for my $comp (qw(cinder nova)) {
 			my $dir = $cfg->{sub}->{$part}->{$comp};
 			chdir($dir) or die "Could not change into $dir: $!\n";
-			run_command @{$cfg->{git}}, 'init';
+			git_init $cfg;
 			git_status_ok $cfg;
 		}
 	}