--- a/toolkit/mozapps/update/tests/marionette/update_test_ota_simple.py
+++ b/toolkit/mozapps/update/tests/marionette/update_test_ota_simple.py
@@ -8,13 +8,13 @@ class UpdateTestOTASimple(B2GUpdateTestC
         prefs = {
             "b2g.update.apply-idle-timeout": 0
         }
         mar_path = os.path.join(update_test_dir, "unit", "data", "simple.mar")
         self.stage_update(complete_mar=mar_path, prefs=prefs)
         B2GUpdateTestCase.setUp(self)
 
     def test_ota_simple(self):
-        self.marionette.set_script_timeout(60 * 1000 * 5)
+        self.marionette.timeout.script = 60 * 5
 
         ota_simple_js = os.path.join(os.path.dirname(__file__),
                                      "update_test_ota_simple.js")
         self.execute_update_test(ota_simple_js, apply=OTA)

--- a/toolkit/mozapps/update/tests/marionette/update_test_status.py
+++ b/toolkit/mozapps/update/tests/marionette/update_test_status.py
@@ -17,13 +17,13 @@ class UpdateTestStatus(B2GUpdateTestCase
         self.runner.adb.push(bad_xml, self.B2G_UPDATES + "/bad.xml")
         self.runner.adb.shell("mkdir " + self.B2G_UPDATES + "/cgi-bin")
         self.runner.adb.push(err_cgi, self.B2G_UPDATES + "/cgi-bin/err.cgi")
         self.runner.adb.shell("chmod 755 " + self.B2G_UPDATES + "/cgi-bin/err.cgi")
 
         B2GUpdateTestCase.setUp(self)
 
     def test_status(self):
-        self.marionette.set_script_timeout(30 * 1000)
+        self.marionette.timeout.script = 30
         status_js = os.path.join(os.path.dirname(__file__),
                                  "update_test_status.js")
         self.execute_update_test(status_js)