weakref_fixtures.diff

diff --git a/testing/marionette/harness/marionette/marionette_test/testcases.py b/testing/marionette/harness/marionette/marionette_test/testcases.py
index 18d9b23..b462f24 100644
--- a/testing/marionette/harness/marionette/marionette_test/testcases.py
+++ b/testing/marionette/harness/marionette/marionette_test/testcases.py
@@ -74,8 +74,12 @@ class CommonTestCase(unittest.TestCase):
     failureException = AssertionError
     pydebugger = None
 
-    def __init__(self, methodName, **kwargs):
+    def __init__(self, methodName, marionette_weakref, fixtures, **kwargs):
         super(CommonTestCase, self).__init__(methodName)
+        self.methodName = methodName
+
+        self._marionette_weakref = marionette_weakref
+        self.fixtures = fixtures
 
         self.loglines = []
         self.duration = 0
@@ -422,15 +426,11 @@ class MarionetteTestCase(CommonTestCase):
 
     def __init__(self, marionette_weakref, fixtures, methodName='runTest',
                  filepath='', **kwargs):
-        self._marionette_weakref = marionette_weakref
-        self.fixtures = fixtures
-        self.methodName = methodName
         self.filepath = filepath
         self.testvars = kwargs.pop('testvars', None)
 
-        self.marionette = None
-
-        super(MarionetteTestCase, self).__init__(methodName, **kwargs)
+        super(MarionetteTestCase, self).__init__(
+            methodName, marionette_weakref=marionette_weakref, fixtures=fixtures, **kwargs)
 
     @classmethod
     def add_tests_to_suite(cls, mod_name, filepath, suite, testloader, marionette,
@@ -508,14 +508,13 @@ class MarionetteJSTestCase(CommonTestCase):
 
     match_re = re.compile(r"test_(.*)\.js$")
 
-    def __init__(self, marionette_weakref, methodName='runTest',
+    def __init__(self, marionette_weakref, fixtures, methodName='runTest',
                  jsFile=None, **kwargs):
         assert(jsFile)
         self.jsFile = jsFile
-        self._marionette_weakref = marionette_weakref
-        self.marionette = None
 
-        super(MarionetteJSTestCase, self).__init__(methodName)
+        super(MarionetteJSTestCase, self).__init__(
+            methodName, marionette_weakref=marionette_weakref, fixtures=fixtures, **kwargs)
 
     @classmethod
     def add_tests_to_suite(cls, mod_name, filepath, suite, testloader, marionette,