diff --git a/py/test/rsession/hostmanage.py b/py/test/rsession/hostmanage.py
index 13cc2944c..373f7195c 100644
--- a/py/test/rsession/hostmanage.py
+++ b/py/test/rsession/hostmanage.py
@@ -41,7 +41,9 @@ class HostInfo(object):
             import os
             targetdir = %r
             if not os.path.isabs(targetdir):
-                homedir = os.environ['HOME']
+                homedir = os.environ.get('HOME', '')
+                if not homedir:
+                    homedir = os.environ.get('HOMEPATH', '.')
                 targetdir = os.path.join(homedir, targetdir)
             if not os.path.exists(targetdir):
                 os.makedirs(targetdir)
diff --git a/py/test/rsession/testing/test_hostmanage.py b/py/test/rsession/testing/test_hostmanage.py
index ed1442d4e..dc81b42f1 100644
--- a/py/test/rsession/testing/test_hostmanage.py
+++ b/py/test/rsession/testing/test_hostmanage.py
@@ -43,7 +43,7 @@ class TestHostInfo:
         x.initgateway()
         assert x.gw
         try:
-            homedir = py.path.local(py.std.os.environ['HOME'])
+            homedir = py.path.local._gethomedir() 
             expected = homedir.join(name) 
             assert x.gw_remotepath == str(expected)
             assert x.localdest == expected