diff --git a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx
index bb7faabc9d..df179ca219 100644
--- a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx
+++ b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx
@@ -41,7 +41,9 @@ describe('RegisterComponentForm', () => {
       ),
     ).toBeInTheDocument();
 
-    const submit = (await rendered.getByRole('button')) as HTMLButtonElement;
+    const submit = (await rendered.getByTestId(
+      'registerComponentFormSubmit',
+    )) as HTMLButtonElement;
     expect(submit.disabled).toBeTruthy();
   });
 
@@ -54,7 +56,9 @@ describe('RegisterComponentForm', () => {
         target: { value: 'https://example.com/blob/master/component.yaml' },
       });
     });
-    const submit = (await rendered.getByRole('button')) as HTMLButtonElement;
+    const submit = (await rendered.getByTestId(
+      'registerComponentFormSubmit',
+    )) as HTMLButtonElement;
 
     expect(submit.disabled).toBeFalsy();
   });
diff --git a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx
index f98ff22a15..294f4db801 100644
--- a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx
+++ b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx
@@ -113,6 +113,7 @@ const RegisterComponentForm: FC<Props> = ({ onSubmit, submitting }) => {
       </FormControl>
       <Button
         id="registerComponentFormSubmit"
+        data-testid="registerComponentFormSubmit"
         variant="contained"
         color="primary"
         type="submit"