diff --git a/ui/cypress/integration/dashboard.test.ts b/ui/cypress/integration/dashboard.test.ts
index 30bc69846..a62000ae2 100644
--- a/ui/cypress/integration/dashboard.test.ts
+++ b/ui/cypress/integration/dashboard.test.ts
@@ -55,7 +55,7 @@ describe('Use Dashboards', () => {
         cy.getByTestID('dashboard-filter--input').type('Empty')
         cy.getByTestID('dashboard-panel').should('have.text', `Looks like you don’t have any dashboards`)
         cy.getByTestID('dashboard-filter--input').clear().type('Dashboard')
-        cy.getByTestID('Reader Dashboard').click()
+        cy.getByTestID('reader-dashboard').click()
         cy.get('.dashboard-empty--menu').should('not.exist')
         cy.getByTestID('add-cell').should('not.exist')
         cy.getByTestID('show-variables--button').click()
diff --git a/ui/src/dashboards/components/DashboardsTable.tsx b/ui/src/dashboards/components/DashboardsTable.tsx
index a6fe55e00..8f64080ac 100644
--- a/ui/src/dashboards/components/DashboardsTable.tsx
+++ b/ui/src/dashboards/components/DashboardsTable.tsx
@@ -62,7 +62,7 @@ class DashboardsTable extends PureComponent<Props> {
               <td>
                 <Link
                   to={`${dashboardLink}/dashboards/${dashboard.id}`}
-                  data-test={`${dashboard.name}`}
+                  data-test={`${dashboard.name.replace(/\s/g, '-').toLowerCase()}`}
                 >
                   {dashboard.name}
                 </Link>