diff --git a/devtools/client/inspector/rules/test/browser_rules_keyframeLineNumbers.js b/devtools/client/inspector/rules/test/browser_rules_keyframeLineNumbers.js
index 18d5efe8945..b54863977a1 100644
--- a/devtools/client/inspector/rules/test/browser_rules_keyframeLineNumbers.js
+++ b/devtools/client/inspector/rules/test/browser_rules_keyframeLineNumbers.js
@@ -16,11 +16,11 @@ add_task(function*() {
 
   // Insert a new property, which will affect the line numbers.
   let elementRuleEditor = getRuleViewRuleEditor(view, 1);
+  let onRuleViewChanged = view.once("ruleview-changed");
   yield createNewRuleViewProperty(elementRuleEditor, "font-size: 72px");
+  yield onRuleViewChanged;
 
-  let onRefresh = view.once("ruleview-refreshed");
   yield selectNode("#inner", inspector);
-  yield onRefresh;
 
   let value = getRuleViewLinkTextByIndex(view, 3);
   // Note that this is relative to the <style>.
diff --git a/devtools/client/inspector/test/head.js b/devtools/client/inspector/test/head.js
index 088d11dfab8..fcadc391d36 100644
--- a/devtools/client/inspector/test/head.js
+++ b/devtools/client/inspector/test/head.js
@@ -146,7 +146,9 @@ var openInspector = Task.async(function*(hostType) {
   let inspector = toolbox.getPanel("inspector");
 
   info("Waiting for the inspector to update");
-  yield inspector.once("inspector-updated");
+  if (inspector._updateProgress) {
+    yield inspector.once("inspector-updated");
+  }
 
   yield registerTestActor(toolbox.target.client);
   let testActor = yield getTestActor(toolbox);