diff --git a/__tests__/tests/LoginPage.test.jsx b/__tests__/tests/LoginPage.test.jsx
index 26af4924de..3e47936111 100644
--- a/__tests__/tests/LoginPage.test.jsx
+++ b/__tests__/tests/LoginPage.test.jsx
@@ -79,17 +79,12 @@ describe('<LoginPage />', () => {
     api.login = jest.fn().mockImplementation(() => {
       const loginPromise = Promise.resolve({});
 
-      // wrapped in timeout so this .then happens after state.loading is set to
-      // false in the actual .then handler
-      //
-      // would be improved by using .finally but that's not available for
-      // some reason
       setTimeout(() => {
-        loginPromise.then(() => {
+        loginPromise.finally(() => {
           expect(loginPage.state().loading).toBe(false);
           done();
         });
-      }, 50);
+      }, 1);
 
       return loginPromise;
     });
@@ -109,21 +104,16 @@ describe('<LoginPage />', () => {
       const err = {
         response: { status: 401, message: 'problem' },
       };
-
       const loginPromise = Promise.reject(err);
 
-      // wrapped in timeout so this .then happens after state.loading is set to
-      // false in the actual .then handler
-      //
-      // would be improved by using .finally but that's not available for
-      // some reason
       setTimeout(() => {
         loginPromise.catch(() => {
-          expect(loginPage.state().loading).toBe(false);
           expect(loginPage.state().error).toBe(LOGIN_ERROR_MESSAGE);
+        }).finally(() => {
+          expect(loginPage.state().loading).toBe(false);
           done();
         });
-      }, 50);
+      }, 1);
 
       return loginPromise;
     });
@@ -139,26 +129,21 @@ describe('<LoginPage />', () => {
     expect(loginPage.state().loading).toBe(true);
   });
 
-  test('submit calls api.login handles 401 error', (done) => {
+  test('submit calls api.login handles non-401 error', (done) => {
     api.login = jest.fn().mockImplementation(() => {
       const err = {
         response: { status: 500, message: 'problem' },
       };
-
       const loginPromise = Promise.reject(err);
 
-      // wrapped in timeout so this .then happens after state.loading is set to
-      // false in the actual .then handler
-      //
-      // would be improved by using .finally but that's not available for
-      // some reason
       setTimeout(() => {
         loginPromise.catch(() => {
-          expect(loginPage.state().loading).toBe(false);
           expect(loginPage.state().error).toBe('');
+        }).finally(() => {
+          expect(loginPage.state().loading).toBe(false);
           done();
         });
-      }, 50);
+      }, 1);
 
       return loginPromise;
     });
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index 0ad82ef756..37f5ece0df 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -50,14 +50,13 @@ class LoginPage extends Component {
       this.safeSetState({ loading: true });
 
       api.login(username, password)
-        .then(() => {
-          this.safeSetState({ loading: false });
-        })
         .catch(error => {
-          this.safeSetState({ loading: false });
           if (error.response.status === 401) {
             this.safeSetState({ error: LOGIN_ERROR_MESSAGE });
           }
+        })
+        .finally(() => {
+          this.safeSetState({ loading: false });
         });
     }
   }