--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -654,41 +654,33 @@ async function getFilterState(hud) {
  *            netxhr: false,
  *            net: false
  *          }
  */
 async function setFilterState(hud, settings) {
   const filterBar = await setFilterBarVisible(hud, true);
 
   for (let category in settings) {
-    let check = settings[category];
+    let setActive = settings[category];
     let button = filterBar.querySelector(`.${category}`);
 
     if (!button) {
       ok(false, `setFilterState() called with a category of ${category}, ` +
                 `which doesn't exist.`);
     }
 
-    info(`Setting the ${category} category to ${check ? "checked" : "disabled"}`);
+    info(`Setting the ${category} category to ${setActive ? "checked" : "disabled"}`);
 
-    let checked = button.classList.contains("checked");
-    if (check) {
-      // Enable filter.
-      if (checked) {
-        return;
-      }
+    let isChecked = button.classList.contains("checked");
+
+    if (setActive !== isChecked) {
       button.click();
+
       await waitFor(() => {
-        return button.classList.contains("checked");
-      });
-    } else if (checked) {
-      // Disable filter.
-      button.click();
-      await waitFor(() => {
-        return !button.classList.contains("checked");
+        return button.classList.contains("checked") === setActive;
       });
     }
   }
 }
 
 /**
  * Set the visibility of the filter bar.
  *