diff --git a/test/pseudo-tty/testcfg.py b/test/pseudo-tty/testcfg.py
index 40396db247e279..41a536104d7cba 100644
--- a/test/pseudo-tty/testcfg.py
+++ b/test/pseudo-tty/testcfg.py
@@ -110,7 +110,6 @@ def RunCommand(self, command, env):
                      self.context.GetTimeout(self.mode),
                      env,
                      True)
-    self.Cleanup()
     return test.TestOutput(self,
                       full_command,
                       output,
diff --git a/tools/test.py b/tools/test.py
index c963196c69a5f3..9a0a48043b8b2b 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -517,21 +517,12 @@ def RunCommand(self, command, env):
                      self.context.GetTimeout(self.mode),
                      env,
                      disable_core_files = self.disable_core_files)
-    self.Cleanup()
     return TestOutput(self,
                       full_command,
                       output,
                       self.context.store_unexpected_output)
 
-  def BeforeRun(self):
-    pass
-
-  def AfterRun(self, result):
-    pass
-
   def Run(self):
-    self.BeforeRun()
-
     try:
       result = self.RunCommand(self.GetCommand(), {
         "TEST_THREAD_ID": "%d" % self.thread_id,
@@ -547,12 +538,8 @@ def Run(self):
         from os import O_NONBLOCK
         for fd in 0,1,2: fcntl(fd, F_SETFL, ~O_NONBLOCK & fcntl(fd, F_GETFL))
 
-    self.AfterRun(result)
     return result
 
-  def Cleanup(self):
-    return
-
 
 class TestOutput(object):