diff --git a/Tests/run.py b/Tests/run.py
index 1576efa9d..dae5bc5ba 100644
--- a/Tests/run.py
+++ b/Tests/run.py
@@ -27,6 +27,8 @@ include = [x for x in sys.argv[1:] if x[:2] != "--"]
 skipped = []
 failed = []
 
+_temproot = tempfile.mkdtemp(prefix='pillow-tests')
+
 ignore_re = re.compile('^ignore: (.*)$', re.MULTILINE)
 
 def test_one(params):
@@ -96,6 +98,8 @@ def main():
     success = failure = 0
     skipped = []
 
+    tester_options.append(_temproot)
+
     python_options = " ".join(python_options)
     tester_options = " ".join(tester_options)
 
@@ -130,9 +134,7 @@ def main():
 
     print("-"*68)
 
-    #UNDONE -- this is wrong 
-    temp_root = os.path.join(tempfile.gettempdir(), 'pillow-tests')
-    tempfiles = glob.glob(os.path.join(temp_root, "temp_*"))
+    tempfiles = glob.glob(os.path.join(_temproot, "temp_*"))
     if tempfiles:
         print("===", "remaining temporary files")
         for file in tempfiles:
diff --git a/Tests/tester.py b/Tests/tester.py
index e2cf00f5e..058e8305b 100644
--- a/Tests/tester.py
+++ b/Tests/tester.py
@@ -1,5 +1,6 @@
 from __future__ import print_function
 import tempfile
+import os
 
 # require that deprecation warnings are triggered
 import warnings
@@ -19,7 +20,10 @@ py3 = (sys.version_info >= (3, 0))
 
 _target = None
 _tempfiles = []
-_temproot = tempfile.mkdtemp(prefix='pillow-tests')
+if 'pillow-tests' in sys.argv[-1] and os.path.exists(sys.argv[-1]):
+    _temproot = sys.argv[-1]
+else:
+    _temproot = tempfile.mkdtemp(prefix='pillow-tests')
 _logfile = None