diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 73849c988..b8577978e 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -295,7 +295,7 @@ class Client(node.Node, pollmixin.PollMixin):
     def _check_hotline(self, hotline_file):
         if os.path.exists(hotline_file):
             mtime = os.stat(hotline_file)[stat.ST_MTIME]
-            if mtime > time.time() - 40.0:
+            if mtime > time.time() - 60.0:
                 return
             else:
                 self.log("hotline file too old, shutting down")
diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index ac3f88b6f..9ced2a71d 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -405,7 +405,7 @@ class RunNode(unittest.TestCase, pollmixin.PollMixin, common_util.SignalMixin,
         def _cb(res):
             out, err, rc_or_sig = res
             self.failUnlessEqual(rc_or_sig, 0)
-            # By writing this file, we get forty seconds before the client will exit. This insures
+            # By writing this file, we get sixty seconds before the client will exit. This insures
             # that even if the 'stop' command doesn't work (and the test fails), the client should
             # still terminate.
             open(HOTLINE_FILE, "w").write("")