diff --git a/components/webdriver_server/actions.rs b/components/webdriver_server/actions.rs
index 1f539c55894..a5f33abe6a5 100644
--- a/components/webdriver_server/actions.rs
+++ b/components/webdriver_server/actions.rs
@@ -327,6 +327,22 @@ impl Handler {
     fn dispatch_keyup_action(&self, source_id: &str, action: &KeyUpAction) {
         let session = self.session().unwrap();
 
+        // Remove the last matching keyUp from `[input_cancel_list]` due to bugs in spec
+        // See https://github.com/w3c/webdriver/issues/1905 &&
+        // https://github.com/servo/servo/issues/37579#issuecomment-2990762713
+        {
+            let mut input_cancel_list = session.input_cancel_list.borrow_mut();
+            if let Some(pos) = input_cancel_list.iter().rposition(|(id, item)| {
+                id == source_id &&
+                    matches!(item,
+                        ActionItem::Key(KeyActionItem::Key(KeyAction::Up(KeyUpAction { value })))
+                    if *value == action.value )
+            }) {
+                info!("dispatch_keyup_action: removing last matching keyup from input_cancel_list");
+                input_cancel_list.remove(pos);
+            }
+        }
+
         let raw_key = action.value.chars().next().unwrap();
         let mut input_state_table = session.input_state_table.borrow_mut();
         let key_input_state = match input_state_table.get_mut(source_id).unwrap() {
@@ -396,6 +412,24 @@ impl Handler {
         }
         pointer_input_state.pressed.remove(&action.button);
 
+        // Remove matching pointerUp(must be unique) from `[input_cancel_list]` due to bugs in spec
+        // See https://github.com/w3c/webdriver/issues/1905 &&
+        // https://github.com/servo/servo/issues/37579#issuecomment-2990762713
+        {
+            let mut input_cancel_list = session.input_cancel_list.borrow_mut();
+            if let Some(pos) = input_cancel_list.iter().position(|(id, item)| {
+                id == source_id &&
+                    matches!(item, ActionItem::Pointer(PointerActionItem::Pointer(PointerAction::Up(
+                    PointerUpAction { button, .. },
+                ))) if *button == action.button )
+            }) {
+                info!(
+                    "dispatch_pointerup_action: removing matching pointerup from input_cancel_list"
+                );
+                input_cancel_list.remove(pos);
+            }
+        }
+
         self.increment_num_pending_actions();
         let msg_id = self.current_action_id.get();
         let cmd_msg = WebDriverCommandMsg::MouseButtonAction(
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index b316ffa566e..19af5bafe65 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -64,7 +64,7 @@ use webdriver::response::{
 };
 use webdriver::server::{self, Session, SessionTeardownKind, WebDriverHandler};
 
-use crate::actions::{ActionItem, ActionsByTick, InputSourceState, PointerInputState};
+use crate::actions::{ActionItem, InputSourceState, PointerInputState};
 
 #[derive(Default)]
 pub struct WebDriverMessageIdGenerator {
@@ -1758,8 +1758,10 @@ impl Handler {
         // only one command can run at a time, so this will never block."
 
         // Step 6. Let undo actions be input cancel list in reverse order.
-        let mut input_cancel_list = session.input_cancel_list.borrow_mut();
-        let undo_actions: ActionsByTick = input_cancel_list
+
+        let undo_actions = session
+            .input_cancel_list
+            .borrow_mut()
             .drain(..)
             .rev()
             .map(|(id, action_item)| HashMap::from([(id, action_item)]))
diff --git a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini
index 85afe070906..a9085c8ada1 100644
--- a/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini
+++ b/tests/wpt/meta/webdriver/tests/classic/element_send_keys/send_keys.py.ini
@@ -1,9 +1,3 @@
 [send_keys.py]
   [test_no_browsing_context]
     expected: FAIL
-
-  [test_no_such_element_with_shadow_root]
-    expected: FAIL
-
-  [test_surrogates]
-    expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini
index 7a6fdf5a5ff..71745169f3f 100644
--- a/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini
+++ b/tests/wpt/meta/webdriver/tests/classic/find_element_from_element/find.py.ini
@@ -2,9 +2,6 @@
   [test_no_browsing_context]
     expected: FAIL
 
-  [test_no_such_element_with_shadow_root]
-    expected: FAIL
-
   [test_no_such_element_with_startnode_from_other_frame]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini
index 3255f206fb9..b7871113dd7 100644
--- a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini
+++ b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_element/find.py.ini
@@ -2,9 +2,6 @@
   [test_no_browsing_context]
     expected: FAIL
 
-  [test_no_such_element_with_shadow_root]
-    expected: FAIL
-
   [test_no_such_element_with_startnode_from_other_frame]
     expected: FAIL
 
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini
index 18467b31c8f..1e21171928d 100644
--- a/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/key.py.ini
@@ -5,14 +5,8 @@
   [test_key_down_closes_browsing_context]
     expected: FAIL
 
-  [test_element_in_shadow_tree[outer-open\]]
-    expected: FAIL
-
   [test_element_in_shadow_tree[outer-closed\]]
     expected: FAIL
 
-  [test_element_in_shadow_tree[inner-open\]]
-    expected: FAIL
-
   [test_element_in_shadow_tree[inner-closed\]]
     expected: FAIL
diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini
index 62af3a877f5..b64bac15ff9 100644
--- a/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini
+++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/pointer_contextmenu.py.ini
@@ -4,6 +4,3 @@
 
   [test_control_click[\\ue051-ctrlKey\]]
     expected: FAIL
-
-  [test_release_control_click]
-    expected: FAIL