--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -803,22 +803,19 @@ setReq.onerror = function() {
 
     def run_tests(self, tests):
         self.reset_test_stats()
         self.start_time = time.time()
 
         need_external_ip = True
         if not self.marionette:
             self.start_marionette()
-            # Retrieve capabilities for later use
-            if not self._capabilities:
-                self.capabilities
             # if we're working against a desktop version, we usually don't need
             # an external ip
-            if self._capabilities['device'] == "desktop":
+            if self.capabilities['device'] == "desktop":
                 need_external_ip = False
         self.logger.info('Initial Profile Destination is '
                          '"{}"'.format(self.marionette.profile_path))
 
         # Gaia sets server_root and that means we shouldn't spin up our own httpd
         if not self.httpd:
             if self.server_root is None or os.path.isdir(self.server_root):
                 self.logger.info("starting httpd")