diff --git a/py/test/config.py b/py/test/config.py
index d3427e715..565634831 100644
--- a/py/test/config.py
+++ b/py/test/config.py
@@ -226,6 +226,7 @@ class Config(object):
         class override:
             def __init__(self, d):
                 self.__dict__.update(d)
+                self.__file__ = "<options from remote>"
         args, conftestdict, cmdlineopts = repr
         self.args = [self.topdir.join(x) for x in args]
         self.conftest.setinitial(self.args)
diff --git a/py/test/terminal/remote.py b/py/test/terminal/remote.py
index 98a74df0d..dbb1db891 100644
--- a/py/test/terminal/remote.py
+++ b/py/test/terminal/remote.py
@@ -130,6 +130,8 @@ def slaverun_TerminalSession(channel):
     config.option.looponfailing = False 
     config.option.usepdb = False 
     config.option.executable = None
+    if failures:
+        config.option.verbose = True
 
     session = config.initsession()
     session.shouldclose = channel.isclosed