diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
index c8707f8959f0c..95629248e2cbe 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
@@ -240,7 +240,7 @@ describe('SpacesGridPage', () => {
     wrapper.update();
 
     const activeRow = wrapper.find('[data-test-subj="spacesListTableRow-custom-2"]');
-    const switchAction = activeRow.find('EuiButtonIcon[data-test-subj="Custom 2-switchSpace"]');
+    const switchAction = activeRow.find('EuiButtonIcon[data-test-subj="custom-2-switchSpace"]');
     expect(switchAction.prop('isDisabled')).toBe(true);
   });
 
@@ -272,7 +272,7 @@ describe('SpacesGridPage', () => {
     wrapper.update();
 
     const nonActiveRow = wrapper.find('[data-test-subj="spacesListTableRow-default"]');
-    const switchAction = nonActiveRow.find('EuiButtonIcon[data-test-subj="Default-switchSpace"]');
+    const switchAction = nonActiveRow.find('EuiButtonIcon[data-test-subj="default-switchSpace"]');
     expect(switchAction.prop('isDisabled')).toBe(false);
   });
 
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 462b65f327ebc..479b2fff19964 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -428,7 +428,7 @@ export class SpacesGridPage extends Component<Props, State> {
             reactRouterNavigate(this.props.history, this.getEditSpacePath(rowRecord)).href,
           onClick: (rowRecord) =>
             reactRouterNavigate(this.props.history, this.getEditSpacePath(rowRecord)).onClick,
-          'data-test-subj': (rowRecord) => `${rowRecord.name}-editSpace`,
+          'data-test-subj': (rowRecord) => `${rowRecord.id}-editSpace`,
         },
         {
           isPrimary: true,
@@ -436,7 +436,7 @@ export class SpacesGridPage extends Component<Props, State> {
             defaultMessage: 'Switch',
           }),
           description: (rowRecord) =>
-            activeSpace?.name !== rowRecord.name
+            activeSpace?.id !== rowRecord.id
               ? i18n.translate(
                   'xpack.spaces.management.spacesGridPage.switchSpaceActionDescription',
                   {
@@ -460,8 +460,8 @@ export class SpacesGridPage extends Component<Props, State> {
               rowRecord.id,
               `${ENTER_SPACE_PATH}?next=/app/management/kibana/spaces/`
             ),
-          enabled: (rowRecord) => activeSpace?.name !== rowRecord.name,
-          'data-test-subj': (rowRecord) => `${rowRecord.name}-switchSpace`,
+          enabled: (rowRecord) => activeSpace?.id !== rowRecord.id,
+          'data-test-subj': (rowRecord) => `${rowRecord.id}-switchSpace`,
         },
         {
           name: i18n.translate('xpack.spaces.management.spacesGridPage.deleteActionName', {
@@ -485,7 +485,7 @@ export class SpacesGridPage extends Component<Props, State> {
           color: 'danger',
           onClick: (rowRecord: Space) => this.onDeleteSpaceClick(rowRecord),
           enabled: (rowRecord: Space) => !isReservedSpace(rowRecord),
-          'data-test-subj': (rowRecord) => `${rowRecord.name}-deleteSpace`,
+          'data-test-subj': (rowRecord) => `${rowRecord.id}-deleteSpace`,
         },
       ],
     });