diff --git a/tools/wptrunner/wptrunner/browsers/servodriver.py b/tools/wptrunner/wptrunner/browsers/servodriver.py
index 0d23cc66f58d6c..4d86b6c4fa6611 100644
--- a/tools/wptrunner/wptrunner/browsers/servodriver.py
+++ b/tools/wptrunner/wptrunner/browsers/servodriver.py
@@ -62,7 +62,7 @@ def env_extras(**kwargs):
 
 def env_options():
     return {"server_host": "127.0.0.1",
-            "supports_debugger": False}
+            "supports_debugger": True}
 
 
 def update_properties():
@@ -88,6 +88,9 @@ def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1",
         env["HOST_FILE"] = hosts_path
         env["RUST_BACKTRACE"] = "1"
 
+        if debug_info:
+            env["DELAY_AFTER_ACCEPT"] = env.get("DELAY_SECS", "15")
+
         args = [
             "--hard-fail",
             "--webdriver=%s" % port,