--- a/build/mobile/b2gautomation.py
+++ b/build/mobile/b2gautomation.py
@@ -140,17 +140,17 @@ class B2GRemoteAutomation(Automation):
                     serial = thisSerial
                     status = result.group(2)
 
         return (serial, status)
 
     def restartB2G(self):
         self._devicemanager.checkCmd(['shell', 'stop', 'b2g'])
         # Wait for a bit to make sure B2G has completely shut down.
-        time.sleep(5)
+        time.sleep(10)
         self._devicemanager.checkCmd(['shell', 'start', 'b2g'])
         if self._is_emulator:
             self.marionette.emulator.wait_for_port()
 
     def rebootDevice(self):
         # find device's current status and serial number
         serial, status = self.getDeviceStatus()
 
@@ -187,17 +187,17 @@ class B2GRemoteAutomation(Automation):
         if self._is_emulator:
             self.restartB2G()
         else:
             self.rebootDevice()
 
         # Infrequently, gecko comes up before networking does, so wait a little
         # bit to give the network time to become available.
         # XXX:  need a more robust mechanism for this
-        time.sleep(20)
+        time.sleep(40)
 
         # Set up port forwarding again for Marionette, since any that
         # existed previously got wiped out by the reboot.
         if not self._is_emulator:
             self._devicemanager.checkCmd(['forward',
                                           'tcp:%s' % self.marionette.port,
                                           'tcp:%s' % self.marionette.port])