diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py
index 968e07dbb60..bd3308a57fe 100644
--- a/lib/spack/llnl/util/lock.py
+++ b/lib/spack/llnl/util/lock.py
@@ -264,7 +264,7 @@ def _write_log_debug_data(self):
         self.old_host = self.host
 
         self.pid = os.getpid()
-        self.host = socket.getfqdn()
+        self.host = socket.gethostname()
 
         # write pid, host to disk to sync over FS
         self._file.seek(0)
diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py
index ff30cedf6d4..4911ac9ae3b 100644
--- a/lib/spack/spack/test/llnl/util/lock.py
+++ b/lib/spack/spack/test/llnl/util/lock.py
@@ -1192,7 +1192,7 @@ def read():
 class LockDebugOutput(object):
     def __init__(self, lock_path):
         self.lock_path = lock_path
-        self.host = socket.getfqdn()
+        self.host = socket.gethostname()
 
     def p1(self, barrier, q1, q2):
         # exchange pids