diff --git a/testing/mochitest/mochitest_options.py b/testing/mochitest/mochitest_options.py
index 2e28a0591fc4..2424b24850af 100644
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -1286,10 +1286,7 @@ class AndroidArguments(ArgumentContainer):
                 ]
 
         if options.remoteWebServer is None:
-            if os.name != "nt":
-                options.remoteWebServer = moznetwork.get_ip()
-            else:
-                parser.error("you must specify a --remote-webserver=<ip address>")
+            options.remoteWebServer = moznetwork.get_ip()
 
         options.webServer = options.remoteWebServer
 
diff --git a/testing/mochitest/runjunit.py b/testing/mochitest/runjunit.py
index 1cf3aa849c98..a97a698eccaa 100644
--- a/testing/mochitest/runjunit.py
+++ b/testing/mochitest/runjunit.py
@@ -107,10 +107,7 @@ class JUnitTestRunner(MochitestDesktop):
         self.websocketProcessBridge = None
         self.SERVER_STARTUP_TIMEOUT = 180 if mozinfo.info.get("debug") else 90
         if self.options.remoteWebServer is None:
-            if os.name != "nt":
-                self.options.remoteWebServer = moznetwork.get_ip()
-            else:
-                raise UserError("--remote-webserver must be specified")
+            self.options.remoteWebServer = moznetwork.get_ip()
         self.options.webServer = self.options.remoteWebServer
         self.options.webSocketPort = "9988"
         self.options.httpdPath = None