--- a/testing/webdriver/src/error.rs
+++ b/testing/webdriver/src/error.rs
@@ -189,21 +189,21 @@ impl ErrorStatus {
             InvalidArgument => BadRequest,
             InvalidCookieDomain => BadRequest,
             InvalidCoordinates => BadRequest,
             InvalidElementState => BadRequest,
             InvalidSelector => BadRequest,
             InvalidSessionId => NotFound,
             JavascriptError => InternalServerError,
             MoveTargetOutOfBounds => InternalServerError,
-            NoSuchAlert => BadRequest,
+            NoSuchAlert => NotFound,
             NoSuchCookie => NotFound,
             NoSuchElement => NotFound,
-            NoSuchFrame => BadRequest,
-            NoSuchWindow => BadRequest,
+            NoSuchFrame => NotFound,
+            NoSuchWindow => NotFound,
             ScriptTimeout => RequestTimeout,
             SessionNotCreated => InternalServerError,
             StaleElementReference => BadRequest,
             Timeout => RequestTimeout,
             UnableToCaptureScreen => BadRequest,
             UnableToSetCookie => InternalServerError,
             UnexpectedAlertOpen => InternalServerError,
             UnknownCommand => NotFound,