--- a/git-2.0.4.ebuild	2014-10-17 17:29:16.039399314 -0700
+++ a/git-2.0.4.ebuild	2014-10-17 17:30:24.905397239 -0700
@@ -90,7 +90,10 @@ 
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
+	test? (
+		app-crypt/gnupg
+		sys-apps/coreutils
+	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
@@ -607,7 +610,7 @@ 
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
+	USER=$(id -u -n) nonfatal git_emake --keep-going test
 	rc=$?
 
 	# Display nice results, now print the results