diff --git a/tests/TestMachineAction.py b/tests/TestMachineAction.py
index 5d1805b707..f1487a1d9f 100755
--- a/tests/TestMachineAction.py
+++ b/tests/TestMachineAction.py
@@ -104,3 +104,18 @@ def test_addMachineAction(machine_action_manager):
     machine_action_manager.addFirstStartAction(test_machine, "test_action")
     machine_action_manager.addFirstStartAction(test_machine, "test_action")
     assert machine_action_manager.getFirstStartActions(test_machine) == [test_action, test_action]
+
+    # Adding unknown action should not crash.
+    machine_action_manager.addFirstStartAction(test_machine, "key_that_doesnt_exists")
+
+def test_removeMachineAction(machine_action_manager):
+    test_action = MachineAction(key="test_action")
+    test_machine = Machine("test_machine")
+    machine_action_manager.addMachineAction(test_action)
+
+    # Remove the machine action
+    machine_action_manager.removeMachineAction(test_action)
+    assert machine_action_manager.getMachineAction("test_action") is None
+
+    # Attempting to remove it again should not crash.
+    machine_action_manager.removeMachineAction(test_action)