diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
index 4ce0b9a8ae8..632aaaa70c6 100644
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -29,7 +29,7 @@ support-files =
 [browser_target_remote.js]
 [browser_target_support.js]
 [browser_two_tabs.js]
-skip-if = e10s && debug && os == 'win'
+skip-if = e10s && debug && os == 'win' # Bug 1231869
 [browser_toolbox_dynamic_registration.js]
 [browser_toolbox_getpanelwhenready.js]
 [browser_toolbox_highlight.js]
@@ -40,11 +40,8 @@ skip-if = true # Bug 1177463 - Temporarily hide the minimize button
 [browser_toolbox_options.js]
 [browser_toolbox_options_disable_buttons.js]
 [browser_toolbox_options_disable_cache-01.js]
-skip-if = e10s # Bug 1030318
 [browser_toolbox_options_disable_cache-02.js]
-skip-if = e10s # Bug 1030318
 [browser_toolbox_options_disable_js.js]
-skip-if = e10s # Bug 1030318
 # [browser_toolbox_raise.js] # Bug 962258
 # skip-if = os == "win"
 [browser_toolbox_ready.js]
diff --git a/devtools/client/framework/test/browser_toolbox_options_disable_js.js b/devtools/client/framework/test/browser_toolbox_options_disable_js.js
index 7aa812b1afe..512a50721d8 100644
--- a/devtools/client/framework/test/browser_toolbox_options_disable_js.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_js.js
@@ -57,29 +57,21 @@ function testJSEnabledIframe(secondPass) {
   }
 }
 
-function toggleJS() {
-  let deferred = promise.defer();
+let toggleJS = Task.async(function*() {
   let panel = toolbox.getCurrentPanel();
   let cbx = panel.panelDoc.getElementById("devtools-disable-javascript");
 
-  cbx.scrollIntoView();
-
   if (cbx.checked) {
     info("Clearing checkbox to re-enable JS");
   } else {
     info("Checking checkbox to disable JS");
   }
 
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    doc = content.document;
-    deferred.resolve();
-  }, true);
-
+  let browserLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
   cbx.click();
-
-  return deferred.promise;
-}
+  yield browserLoaded;
+  doc = content.document;
+});
 
 function testJSDisabled() {
   info("Testing that JS is disabled");
diff --git a/devtools/client/framework/test/helper_disable_cache.js b/devtools/client/framework/test/helper_disable_cache.js
index 4f964b16c63..720008257ea 100644
--- a/devtools/client/framework/test/helper_disable_cache.js
+++ b/devtools/client/framework/test/helper_disable_cache.js
@@ -48,15 +48,19 @@ function* checkCacheEnabled(tabX, expected) {
 
   yield reloadTab(tabX);
 
-  let doc = content.document;
-  let h1 = doc.querySelector("h1");
-  let oldGuid = h1.textContent;
+  let oldGuid = yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function() {
+    let doc = content.document;
+    let h1 = doc.querySelector("h1");
+    return h1.textContent;
+  });
 
   yield reloadTab(tabX);
 
-  doc = content.document;
-  h1 = doc.querySelector("h1");
-  let guid = h1.textContent;
+  let guid = yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function() {
+    let doc = content.document;
+    let h1 = doc.querySelector("h1");
+    return h1.textContent;
+  });
 
   if (expected) {
     is(guid, oldGuid, tabX.title + " cache is enabled");
@@ -71,14 +75,9 @@ function* setDisableCacheCheckboxChecked(tabX, state) {
   let panel = tabX.toolbox.getCurrentPanel();
   let cbx = panel.panelDoc.getElementById("devtools-disable-cache");
 
-  cbx.scrollIntoView();
-
-  // After uising scrollIntoView() we need to wait for the browser to scroll.
-  yield waitForTick();
-
   if (cbx.checked !== state) {
     info("Setting disable cache checkbox to " + state + " for " + tabX.title);
-    EventUtils.synthesizeMouseAtCenter(cbx, {}, panel.panelWin);
+    cbx.click();
 
     // We need to wait for all checkboxes to be updated and the docshells to
     // apply the new cache settings.