diff --git a/py/test/config.py b/py/test/config.py
index bfdd21d52..08ac4057e 100644
--- a/py/test/config.py
+++ b/py/test/config.py
@@ -6,17 +6,15 @@ from py.__.test.defaultconftest import adddefaultoptions
 
 optparse = py.compat.optparse
 
-def ensuretemp(string, dir=1, _pid2dir={}): 
+# XXX move to Config class
+basetemp = None
+def ensuretemp(string, dir=1): 
     """ return temporary directory path with
         the given string as the trailing part. 
     """ 
-    # we may be in a forking situation and want to use
-    # separate dirs then (XXX or not?)
-    pid = py.std.os.getpid()
-    basetemp = _pid2dir.get(pid, None)
+    global basetemp
     if basetemp is None: 
         basetemp = py.path.local.make_numbered_dir(prefix='pytest-')
-        _pid2dir[pid] = basetemp 
     return basetemp.ensure(string, dir=dir) 
   
 class CmdOptions(object):
diff --git a/py/test/testing/test_config.py b/py/test/testing/test_config.py
index 0bde2f057..275f57503 100644
--- a/py/test/testing/test_config.py
+++ b/py/test/testing/test_config.py
@@ -10,21 +10,6 @@ def test_tmpdir():
     assert d1 == d2
     assert d1.check(dir=1) 
 
-def test_ensuretemp_fork():
-    os = py.std.os
-    org_getpid = os.getpid
-    currpid = 0
-    def getpid():
-        return currpid
-    try:
-        os.getpid = getpid
-        d1 = py.test.ensuretemp('hello')
-        currpid = 1
-        d2 = py.test.ensuretemp('hello')
-    finally:
-        os.getpid = org_getpid
-    assert d1 != d2
-
 def test_config_cmdline_options(): 
     o = py.test.ensuretemp('configoptions') 
     o.ensure("conftest.py").write(py.code.Source("""