--- a/testing/marionette/harness/marionette_harness/tests/unit/test_crash.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_crash.py
@@ -1,17 +1,21 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import glob
 import shutil
 
 from marionette_driver import Wait
-from marionette_driver.errors import MarionetteException, NoSuchWindowException
+from marionette_driver.errors import (
+    MarionetteException,
+    NoSuchWindowException,
+    TimeoutException
+)
 
 from marionette_harness import MarionetteTestCase, expectedFailure, run_if_e10s
 
 # Import runner module to monkey patch mozcrash module
 from mozrunner.base import runner
 
 
 class MockMozCrash(object):
@@ -27,20 +31,29 @@ class MockMozCrash(object):
                     getService(Components.interfaces.nsICrashReporter);
                   return true;
                 } catch (exc) {
                   return false;
                 }
             """)
 
     def check_for_crashes(self, dump_directory, *args, **kwargs):
-        minidump_files = glob.glob('{}/*.dmp'.format(dump_directory))
-        shutil.rmtree(dump_directory)
+        if self.crash_reporter_enabled:
+            # Workaround until bug 1376795 has been fixed
+            # Wait at maximum 5s for the minidump files being created
+            # minidump_files = glob.glob('{}/*.dmp'.format(dump_directory))
+            try:
+                minidump_files = Wait(None, timeout=5).until(
+                    lambda _: glob.glob('{}/*.dmp'.format(dump_directory))
+                )
+            except TimeoutException:
+                minidump_files = []
 
-        if self.crash_reporter_enabled:
+            shutil.rmtree(dump_directory)
+
             return len(minidump_files)
         else:
             return len(minidump_files) == 0
 
     def log_crashes(self, logger, dump_directory, *args, **kwargs):
         return self.check_for_crashes(dump_directory, *args, **kwargs)
 
 
@@ -48,18 +61,23 @@ class BaseCrashTestCase(MarionetteTestCa
 
     # Reduce the timeout for faster processing of the tests
     socket_timeout = 10
 
     def setUp(self):
         super(BaseCrashTestCase, self).setUp()
 
         # Monkey patch mozcrash to avoid crash info output only for our triggered crashes.
+        mozcrash_mock = MockMozCrash(self.marionette)
+        if not mozcrash_mock.crash_reporter_enabled:
+            self.skipTest('Crash reporter disabled')
+            return
+
         self.mozcrash = runner.mozcrash
-        runner.mozcrash = MockMozCrash(self.marionette)
+        runner.mozcrash = mozcrash_mock
 
         self.crash_count = self.marionette.crashed
         self.pid = self.marionette.process_id
         self.remote_uri = self.marionette.absolute_url("javascriptPage.html")
 
     def tearDown(self):
         # Replace mockup with original mozcrash instance
         runner.mozcrash = self.mozcrash

--- a/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
+++ b/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
@@ -115,10 +115,10 @@ skip-if = appname == 'fennec' || os == "
 [test_chrome.py]
 skip-if = appname == 'fennec'
 
 [test_addons.py]
 skip-if = appname == 'fennec' # Bug 1330598
 
 [test_select.py]
 [test_crash.py]
-skip-if = manage_instance == false || appname == 'fennec' || ccov # Bug 1298921, bug 1322993, and bug 1377876
+skip-if = manage_instance == false || appname == 'fennec' # Bug 1298921, bug 1322993
 [test_localization.py]