diff --git a/containers/login/LoginForm.js b/containers/login/LoginForm.js
index 80196c9c7..2754d071d 100644
--- a/containers/login/LoginForm.js
+++ b/containers/login/LoginForm.js
@@ -34,6 +34,7 @@ const LoginForm = ({ onSubmit, loading }) => {
                     value={username}
                     placeholder={c('Placeholder').t`Username`}
                     onChange={onChange(setUsername)}
+                    data-cy-login="username"
                 />
             </Label>
             <Label htmlFor="password" className="bl mb1">
@@ -48,9 +49,10 @@ const LoginForm = ({ onSubmit, loading }) => {
                     value={password}
                     placeholder={c('Placeholder').t`Password`}
                     onChange={onChange(setPassword)}
+                    data-cy-login="password"
                 />
             </Label>
-            <Button type="submit" className="pm-button-blue w100" disabled={loading}>
+            <Button type="submit" className="pm-button-blue w100" disabled={loading} data-cy-login="submit">
                 Login
             </Button>
             <p>
diff --git a/containers/login/TOTPForm.js b/containers/login/TOTPForm.js
index ffae5f2d2..a7dedf145 100644
--- a/containers/login/TOTPForm.js
+++ b/containers/login/TOTPForm.js
@@ -38,10 +38,11 @@ const TOTPForm = ({ onSubmit, loading }) => {
                     value={totp}
                     placeholder={c('Placeholder').t`Two-factor code`}
                     onChange={onChange(setTotp)}
+                    data-cy-login="TOTP"
                 />
             </div>
             <div>
-                <Button type="submit" disabled={loading}>
+                <Button type="submit" disabled={loading} data-cy-login="submit TOTP">
                     Submit
                 </Button>
             </div>
diff --git a/containers/login/UnlockForm.js b/containers/login/UnlockForm.js
index be26289c8..f3c91ef68 100644
--- a/containers/login/UnlockForm.js
+++ b/containers/login/UnlockForm.js
@@ -31,10 +31,11 @@ const UnlockForm = ({ onSubmit, loading }) => {
                     value={password}
                     placeholder={c('Placeholder').t`Mailbox password`}
                     onChange={onChange(setPassword)}
+                    data-cy-login="mailbox password"
                 />
             </div>
             <div>
-                <Button type="submit" disabled={loading}>
+                <Button type="submit" disabled={loading} data-cy-login="submit mailbox password">
                     Submit
                 </Button>
             </div>