--- a/devtools/testlib.py	Wed Jul 29 10:51:52 2015 +0200
+++ b/devtools/testlib.py	Fri Jul 31 15:17:43 2015 +0200
@@ -1018,7 +1018,8 @@
 
     def assertDocTestFile(self, testfile):
         # doctest returns tuple (failure_count, test_count)
-        result = self.shell().process_script(testfile)
+        with self.admin_access.shell() as mih:
+            result = mih.process_script(testfile)
         if result[0] and result[1]:
             raise self.failureException("doctest file '%s' failed"
                                         % testfile)