diff --git a/cypress/e2e/page/breadcrumb-navigation-complete.cy.ts b/cypress/e2e/page/breadcrumb-navigation.cy.ts
similarity index 100%
rename from cypress/e2e/page/breadcrumb-navigation-complete.cy.ts
rename to cypress/e2e/page/breadcrumb-navigation.cy.ts
diff --git a/src/components/_shared/modal/NormalModal.tsx b/src/components/_shared/modal/NormalModal.tsx
index 30b52245..1c703e6c 100644
--- a/src/components/_shared/modal/NormalModal.tsx
+++ b/src/components/_shared/modal/NormalModal.tsx
@@ -95,7 +95,7 @@ export function NormalModal ({
             {modalCancelText}
           </Button>
           <Button
-            data-testid={danger ? 'confirm-delete-button' : undefined}
+            data-testid={danger ? 'confirm-delete-button' : 'modal-ok-button'}
             color={danger ? 'error' : 'primary'}
             variant={'contained'}
             size={'small'}
diff --git a/src/components/app/view-actions/CreateSpaceModal.tsx b/src/components/app/view-actions/CreateSpaceModal.tsx
index 70df80df..2563065c 100644
--- a/src/components/app/view-actions/CreateSpaceModal.tsx
+++ b/src/components/app/view-actions/CreateSpaceModal.tsx
@@ -59,12 +59,9 @@ function CreateSpaceModal({
       classes={{ container: 'items-start max-md:mt-auto max-md:items-center mt-[10%] ' }}
       okLoading={loading}
       onOk={handleOk}
-      okButtonProps={{
-        'data-testid': 'modal-ok-button',
-      }}
       PaperProps={{
         className: 'w-[600px] max-w-[70vw]',
-        'data-testid': 'create-space-modal',
+        ...({ 'data-testid': 'create-space-modal' } as Record<string, unknown>),
       }}
     >
       <div