--- Lib/test/test_webbrowser.py.orig	2016-06-26 00:38:37.000000000 +0300
+++ Lib/test/test_webbrowser.py	2016-10-25 16:41:44.019857499 +0300
@@ -95,23 +95,23 @@
 
     def test_open(self):
         self._test('open',
-                   options=['-raise', '-remote'],
-                   arguments=['openURL({})'.format(URL)])
+                   options=[],
+                   arguments=[URL])
 
     def test_open_with_autoraise_false(self):
         self._test('open', kw=dict(autoraise=False),
-                   options=['-noraise', '-remote'],
-                   arguments=['openURL({})'.format(URL)])
+                   options=[],
+                   arguments=[URL])
 
     def test_open_new(self):
         self._test('open_new',
-                   options=['-raise', '-remote'],
-                   arguments=['openURL({},new-window)'.format(URL)])
+                   options=[],
+                   arguments=['-new-window', URL])
 
     def test_open_new_tab(self):
         self._test('open_new_tab',
-                   options=['-raise', '-remote'],
-                   arguments=['openURL({},new-tab)'.format(URL)])
+                   options=[],
+                   arguments=['-new-tab', URL])
 
 
 class GaleonCommandTest(CommandTestMixin, unittest.TestCase):
--- Lib/webbrowser.py.orig	2016-06-26 00:38:37.000000000 +0300
+++ Lib/webbrowser.py	2016-10-25 16:38:16.922443570 +0300
@@ -247,11 +247,11 @@
 class Mozilla(UnixBrowser):
     """Launcher class for Mozilla/Netscape browsers."""
 
-    raise_opts = ["-noraise", "-raise"]
-    remote_args = ['-remote', 'openURL(%s%action)']
+    raise_opts = None
+    remote_args = ['%action', '%s']
     remote_action = ""
-    remote_action_newwin = ",new-window"
-    remote_action_newtab = ",new-tab"
+    remote_action_newwin = "-new-window"
+    remote_action_newtab = "-new-tab"
     background = True
 
 Netscape = Mozilla