--- a/testing/marionette/harness/marionette/marionette_test/testcases.py
+++ b/testing/marionette/harness/marionette/marionette_test/testcases.py
@@ -248,22 +248,17 @@ class CommonTestCase(unittest.TestCase):
         # Convert the marionette weakref to an object, just for the
         # duration of the test; this is deleted in tearDown() to prevent
         # a persistent circular reference which in turn would prevent
         # proper garbage collection.
         self.start_time = time.time()
         self.marionette = self._marionette_weakref()
         if self.marionette.session is None:
             self.marionette.start_session()
-        if self.marionette.timeout is not None:
-            self.marionette.timeouts(self.marionette.TIMEOUT_SEARCH, self.marionette.timeout)
-            self.marionette.timeouts(self.marionette.TIMEOUT_SCRIPT, self.marionette.timeout)
-            self.marionette.timeouts(self.marionette.TIMEOUT_PAGE, self.marionette.timeout)
-        else:
-            self.marionette.timeouts(self.marionette.TIMEOUT_PAGE, 30000)
+        self.marionette.reset_timeouts()
 
     def tearDown(self):
         pass
 
     def cleanTest(self):
         self._deleteSession()
 
     def _deleteSession(self):

--- a/testing/marionette/harness/session/session_test.py
+++ b/testing/marionette/harness/session/session_test.py
@@ -236,22 +236,17 @@ class CommonTestCase(unittest.TestCase):
         # a persistent circular reference which in turn would prevent
         # proper garbage collection.
         self.start_time = time.time()
         self.pingServer = PingServer()
         self.pingServer.start()
         self.marionette = Marionette(bin=self.binary, profile=self.profile)
         if self.marionette.session is None:
             self.marionette.start_session()
-        if self.marionette.timeout is not None:
-            self.marionette.timeouts(self.marionette.TIMEOUT_SEARCH, self.marionette.timeout)
-            self.marionette.timeouts(self.marionette.TIMEOUT_SCRIPT, self.marionette.timeout)
-            self.marionette.timeouts(self.marionette.TIMEOUT_PAGE, self.marionette.timeout)
-        else:
-            self.marionette.timeouts(self.marionette.TIMEOUT_PAGE, 30000)
+        self.marionette.reset_timeouts()
 
     def tearDown(self):
         self.marionette.cleanup()
         self.pingServer.stop()
 
     def cleanTest(self):
         self._deleteSession()