diff --git a/AUTHORS b/AUTHORS
index 803bb2b18..bea582046 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -340,6 +340,7 @@ Ronny Pfannschmidt
 Ross Lawley
 Ruaridh Williamson
 Russel Winder
+Russell Martin
 Ryan Puddephatt
 Ryan Wooden
 Sadra Barikbin
diff --git a/src/_pytest/tmpdir.py b/src/_pytest/tmpdir.py
index 937b1687a..75391adbc 100644
--- a/src/_pytest/tmpdir.py
+++ b/src/_pytest/tmpdir.py
@@ -204,7 +204,7 @@ def get_user() -> Optional[str]:
         import getpass
 
         return getpass.getuser()
-    except (ImportError, KeyError):
+    except (ImportError, OSError, KeyError):
         return None