diff --git a/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py b/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py
index 2b978b15..79ba6b5e 100644
--- a/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py
+++ b/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py
@@ -27,6 +27,11 @@ class command:
             == self.env["input"]["new_caps_lock"]
         ):
             return
+        current_input = self.env["input"]["curr_input"]
+        previous_input = self.env["input"]["prev_input"]
+        relevant_input = current_input or previous_input
+        if "KEY_CAPSLOCK" not in relevant_input:
+            return
         if self.env["input"]["new_caps_lock"]:
             self.env["runtime"]["OutputManager"].present_text(
                 _("Capslock on"), interrupt=True
diff --git a/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py b/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py
index 7a486d50..4820a53d 100644
--- a/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py
+++ b/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py
@@ -27,6 +27,11 @@ class command:
             == self.env["input"]["new_scroll_lock"]
         ):
             return
+        current_input = self.env["input"]["curr_input"]
+        previous_input = self.env["input"]["prev_input"]
+        relevant_input = current_input or previous_input
+        if "KEY_SCROLLLOCK" not in relevant_input:
+            return
         if self.env["input"]["new_scroll_lock"]:
             self.env["runtime"]["OutputManager"].present_text(
                 _("Scrolllock on"), interrupt=True
diff --git a/src/fenrirscreenreader/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py
index 3d1a410e..c78f44fd 100644
--- a/src/fenrirscreenreader/fenrirVersion.py
+++ b/src/fenrirscreenreader/fenrirVersion.py
@@ -5,4 +5,4 @@
 # By Chrys, Storm Dragon, and contributors.
 
 version = "2026.05.12"
-code_name = "testing"
+code_name = "master"
diff --git a/tests/unit/test_lock_key_commands.py b/tests/unit/test_lock_key_commands.py
new file mode 100644
index 00000000..c52a3845
--- /dev/null
+++ b/tests/unit/test_lock_key_commands.py
@@ -0,0 +1,106 @@
+import importlib.util
+from pathlib import Path
+from unittest.mock import Mock
+
+import pytest
+
+
+def load_lock_command(command_file):
+    command_path = (
+        Path(__file__).resolve().parents[2]
+        / "src"
+        / "fenrirscreenreader"
+        / "commands"
+        / "onKeyInput"
+        / command_file
+    )
+    spec = importlib.util.spec_from_file_location(
+        command_file.replace("-", "_"), command_path
+    )
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module.command
+
+
+def build_env(input_data):
+    output_manager = Mock()
+    return {
+        "input": input_data,
+        "runtime": {
+            "OutputManager": output_manager,
+        },
+    }, output_manager
+
+
+@pytest.mark.unit
+def test_capslock_command_ignores_non_capslock_state_change():
+    command = load_lock_command("80000-capslock.py")()
+    env, output_manager = build_env(
+        {
+            "old_caps_lock": False,
+            "new_caps_lock": True,
+            "curr_input": ["KEY_KP8"],
+            "prev_input": [],
+        }
+    )
+    command.initialize(env)
+
+    command.run()
+
+    output_manager.present_text.assert_not_called()
+
+
+@pytest.mark.unit
+def test_capslock_command_announces_capslock_release_change():
+    command = load_lock_command("80000-capslock.py")()
+    env, output_manager = build_env(
+        {
+            "old_caps_lock": True,
+            "new_caps_lock": False,
+            "curr_input": [],
+            "prev_input": ["KEY_CAPSLOCK"],
+        }
+    )
+    command.initialize(env)
+
+    command.run()
+
+    output_manager.present_text.assert_called_once()
+    assert output_manager.present_text.call_args.args[0] == "Capslock off"
+
+
+@pytest.mark.unit
+def test_scrolllock_command_ignores_non_scrolllock_state_change():
+    command = load_lock_command("80300-scrolllock.py")()
+    env, output_manager = build_env(
+        {
+            "old_scroll_lock": False,
+            "new_scroll_lock": True,
+            "curr_input": ["KEY_KP8"],
+            "prev_input": [],
+        }
+    )
+    command.initialize(env)
+
+    command.run()
+
+    output_manager.present_text.assert_not_called()
+
+
+@pytest.mark.unit
+def test_scrolllock_command_announces_scrolllock_release_change():
+    command = load_lock_command("80300-scrolllock.py")()
+    env, output_manager = build_env(
+        {
+            "old_scroll_lock": True,
+            "new_scroll_lock": False,
+            "curr_input": [],
+            "prev_input": ["KEY_SCROLLLOCK"],
+        }
+    )
+    command.initialize(env)
+
+    command.run()
+
+    output_manager.present_text.assert_called_once()
+    assert output_manager.present_text.call_args.args[0] == "Scrolllock off"