diff --git a/cypress/cypress-integration/support/commands.ts b/cypress/cypress-integration/support/commands.ts
index 98e3f22d237..58357ab3f8c 100644
--- a/cypress/cypress-integration/support/commands.ts
+++ b/cypress/cypress-integration/support/commands.ts
@@ -25,12 +25,17 @@ Cypress.Commands.add('showsSuccessMessage', (shows = true) => {
 });
 
 Cypress.Commands.add('login', (username, route = '/') => {
-  const url = `/log-in?code=${username}@example.com&path=${route}`;
-  cy.visit(url);
-  cy.waitUntilSettled(50);
-  cy.url().should('include', route);
-  cy.showsErrorMessage(false);
-  cy.url().should('not.include', '/mock-login');
+  cy.visit('/login');
+
+  cy.get('[data-testid="email-input"]').type(`${username}@example.com`);
+
+  cy.get('[data-testid="password-input"]').type('Testing1234$', { log: false });
+
+  cy.get('[data-testid="login-button"]').click();
+
+  cy.get('[data-testid="account-menu-button"]');
+
+  cy.visit(route);
 });
 
 Cypress.Commands.add('goToRoute', (...args) => {
diff --git a/web-client/src/views/Login/Login.tsx b/web-client/src/views/Login/Login.tsx
index 7e01f40217e..11f09b5b590 100644
--- a/web-client/src/views/Login/Login.tsx
+++ b/web-client/src/views/Login/Login.tsx
@@ -44,6 +44,7 @@ export const Login = connect(
                   autoCapitalize="off"
                   autoCorrect="off"
                   className="usa-input"
+                  data-testid="email-input"
                   id="email"
                   name="email"
                   type="text"
@@ -61,6 +62,7 @@ export const Login = connect(
                 <input
                   required
                   className="usa-input"
+                  data-testid="password-input"
                   id="password"
                   name="password"
                   type={showPassword ? 'text' : 'password'}
@@ -85,6 +87,7 @@ export const Login = connect(
                 </button>
                 <Button
                   className="usa-button margin-top-3"
+                  data-testid="login-button"
                   onClick={e => {
                     e.preventDefault();
                     submitLoginSequence();