diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index acec7988e..87566ad38 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -454,6 +454,7 @@ class Command:
                 # Special case for count parameter.
                 self._get_count_arg(param, args, kwargs)
                 continue
+            # elif arg_info.win_id:
             elif arg_info.win_id:
                 # Special case for win_id parameter.
                 self._get_win_id_arg(win_id, param, args, kwargs)
diff --git a/tests/unit/commands/test_cmdutils.py b/tests/unit/commands/test_cmdutils.py
index 961e19d02..04cabfe0a 100644
--- a/tests/unit/commands/test_cmdutils.py
+++ b/tests/unit/commands/test_cmdutils.py
@@ -24,6 +24,13 @@ import pytest
 from qutebrowser.commands import cmdutils, cmdexc, argparser, command
 
 
+@pytest.fixture(autouse=True)
+def clear_globals(monkeypatch):
+    """Clear the cmdutils globals between each test."""
+    monkeypatch.setattr(cmdutils, 'cmd_dict', {})
+    monkeypatch.setattr(cmdutils, 'aliases', [])
+
+
 class TestCheckOverflow:
 
     def test_good(self):
@@ -81,12 +88,6 @@ class TestRegister:
 
     # pylint: disable=unused-variable
 
-    @pytest.fixture(autouse=True)
-    def clear_globals(self, monkeypatch):
-        """Clear the cmdutils globals between each test."""
-        monkeypatch.setattr(cmdutils, 'cmd_dict', {})
-        monkeypatch.setattr(cmdutils, 'aliases', [])
-
     def test_simple(self):
         @cmdutils.register()
         def fun():