diff --git a/ui/cypress/integration/admin_chronograf.test.ts b/ui/cypress/integration/admin_chronograf.test.ts
index 4a271adb2..29d1feca8 100644
--- a/ui/cypress/integration/admin_chronograf.test.ts
+++ b/ui/cypress/integration/admin_chronograf.test.ts
@@ -66,9 +66,7 @@ describe('Chronograf', () => {
         cy.get('.dropdown-selected').realHover()
         cy.get('.dropdown-selected').click()
         cy.getByTestID(`${chronograf.user.role[1]}-dropdown-item`).realHover()
-        cy.getByTestID(
-          `${chronograf.user.role[1]}-dropdown-item`
-        ).click()
+        cy.getByTestID(`${chronograf.user.role[1]}-dropdown-item`).click()
       })
 
       cy.getByTestID(`${chronograf.user.name}--table-row`).should('be.visible')
@@ -82,4 +80,85 @@ describe('Chronograf', () => {
       })
     })
   })
+
+  describe('All Users', () => {
+    beforeEach(() => {
+      cy.visit(url + '/all-users')
+    })
+
+    it('add user, edit user, and remove it', () => {
+      cy.getByTestID('turn-on-new-users-superAdmin--toggle')
+        .click()
+        .should('have.class', 'active')
+      cy.getByTestID('add-user--button').click()
+      cy.getByTestID('new-user--table-row')
+        .should('exist')
+        .within(() => {
+          cy.getByTestID('cancel-new-user--button').click()
+        })
+      cy.getByTestID('add-user--button').click()
+      cy.getByTestID('new-user--table-row')
+        .should('exist')
+        .within(() => {
+          cy.getByTestID('username--input').type(chronograf.user.name)
+          cy.getByTestID('dropdown-toggle').click()
+          cy.getByTestID('dropdown-ul')
+            .contains(chronograf.user.orgs[0])
+            .click()
+          cy.getByTestID(
+            `dropdown-selected--${chronograf.user.orgs[0]}`
+          ).should('exist')
+          cy.getByTestID('oauth-provider--input').type(
+            chronograf.user.oauthProvider
+          )
+          cy.getByTestID('confirm-new-user--button').click()
+        })
+
+      cy.getByTestID('turn-off-new-users-superAdmin--toggle')
+        .click()
+        .should('not.have.class', 'active')
+
+      cy.getByTestID(`${chronograf.user.name}--table-row`)
+        .should('exist')
+        .realHover()
+        .then(() => {
+          cy.getByTestID(`${chronograf.user.name}--table-row`).within(() => {
+            cy.getByTestID('turn-off-superAdmin--toggle').click()
+          })
+        })
+
+      cy.getByTestID(`${chronograf.user.name}--table-row`).realHover()
+
+      cy.getByTestID(`${chronograf.user.name}--table-row`).within(() => {
+        cy.getByTestID(`${chronograf.user.orgs[0]}-tag--item`).should('exist')
+        cy.getByTestID('delete-tag--button').clickAttached()
+        cy.getByTestID('delete-tag--button').within(() => {
+          cy.getByTestID('confirm-btn').click()
+        })
+
+        cy.getByTestID(`${chronograf.user.orgs[0]}-tag--item`).should(
+          'not.exist'
+        )
+      })
+
+      cy.getByTestID(`${chronograf.user.name}--table-row`).realHover()
+      cy.getByTestID(`${chronograf.user.name}--table-row`).within(() => {
+        cy.get('.tags-add')
+          .click()
+          .within(() => {
+            cy.get('.tags-add--menu-item')
+              .contains(chronograf.user.orgs[0])
+              .clickAttached()
+          })
+      })
+
+      cy.getByTestID(`${chronograf.user.name}--table-row`).realHover()
+      cy.getByTestID(`${chronograf.user.name}--table-row`).within(() => {
+        cy.getByTestID('delete-user--button').clickAttached()
+        cy.getByTestID('delete-user--button').within(() => {
+          cy.getByTestID('confirm-btn').clickAttached()
+        })
+      })
+    })
+  })
 })
diff --git a/ui/src/shared/components/Tags.tsx b/ui/src/shared/components/Tags.tsx
index 287adfb7f..6dde70004 100644
--- a/ui/src/shared/components/Tags.tsx
+++ b/ui/src/shared/components/Tags.tsx
@@ -32,7 +32,7 @@ const Tags: FunctionComponent<TagsProps> = ({
             item={item}
             onDelete={onDeleteTag}
             confirmText={confirmText}
-            testId={item.text || item.name || item}
+            testId={item.name}
           />
         )
       })}
@@ -47,7 +47,7 @@ interface TagProps {
   confirmText?: string
   item: Item
   onDelete: (item: Item) => void
-  testId?: Item
+  testId?: string
 }
 
 @ErrorHandling
@@ -60,7 +60,7 @@ class Tag extends PureComponent<TagProps> {
     const {item, confirmText, testId} = this.props
     return (
       <span className="input-tag--item">
-        <span>{item.text || item.name || item}</span>
+        <span data-test={testId}>{item.text || item.name || item}</span>
         <ConfirmButton
           icon="remove"
           size="btn-xs"