diff --git a/app-admin/sudo/sudo-1.9.8_p2.ebuild b/app-admin/sudo/sudo-1.9.8_p2.ebuild
index ce24fd918c15c..002fccede0ffd 100644
--- a/app-admin/sudo/sudo-1.9.8_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.8_p2.ebuild
@@ -161,6 +161,7 @@ src_configure() {
 
 src_test() {
 	# See bug #667600 for TZ workaround
+	# Note: drop this after 1.9.8_p2! Should be fixed upstream.
 	TZ=UTC default
 }
 
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index a35ba589af055..de7fec385553a 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -159,11 +159,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_test() {
-	# See bug #667600 for TZ workaround
-	TZ=UTC default
-}
-
 src_install() {
 	default