2 files changed, 4 insertions, 4 deletions
diff --git a/gpsd.c b/gpsd.c
index bc9c89c6..e48bbb8a 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1996,6 +1996,10 @@ int main(int argc, char *argv[])
     }
 #endif /* defined(CONTROL_SOCKET_ENABLE) || defined(SYSTEMD_ENABLE) */
 
+
+    /* gpsd can't work with 'rigth' timezone when leapseconds inserted */
+    (void)putenv("TZ=UTC");
+
     /* might be time to daemonize */
     if (go_background) {
 	/* not SuS/POSIX portable, but we have our own fallback version */
diff --git a/regress-driver b/regress-driver
index 823a7270..f6bcfc02 100755
--- a/regress-driver
+++ b/regress-driver
@@ -96,10 +96,6 @@ then
     opts="$opts -b"
 fi
 
-# GPS tests can spuriously fail on Linuxes that set the so-called "right"
-# timezones with leap-second offset baked it.
-TZ=/usr/share/zoneinfo/UTC
-
 case $mode in
     regress)
         echo "Testing the $testing..." >&2