diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.test.tsx
index ffcf2920c1..eb77240d33 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.test.tsx
@@ -19,14 +19,14 @@ import { AzureRepoPicker } from './AzureRepoPicker';
 import { render, fireEvent } from '@testing-library/react';
 
 describe('AzureRepoPicker', () => {
-  it('renders the three input fields', async () => {
+  it('renders the two input fields', async () => {
     const { getAllByRole } = render(
       <AzureRepoPicker onChange={jest.fn()} rawErrors={[]} state={{}} />,
     );
 
     const allInputs = getAllByRole('textbox');
 
-    expect(allInputs).toHaveLength(3);
+    expect(allInputs).toHaveLength(2);
   });
 
   describe('org field', () => {
@@ -58,19 +58,4 @@ describe('AzureRepoPicker', () => {
       expect(onChange).toHaveBeenCalledWith({ owner: 'owner' });
     });
   });
-
-  describe('repoName field', () => {
-    it('calls onChange when the repoName changes', () => {
-      const onChange = jest.fn();
-      const { getAllByRole } = render(
-        <AzureRepoPicker onChange={onChange} rawErrors={[]} state={{}} />,
-      );
-
-      const repoNameInput = getAllByRole('textbox')[2];
-
-      fireEvent.change(repoNameInput, { target: { value: 'repoName' } });
-
-      expect(onChange).toHaveBeenCalledWith({ repoName: 'repoName' });
-    });
-  });
 });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
index 17fe656006..0ced19a596 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
@@ -26,7 +26,7 @@ describe('BitbucketRepoPicker', () => {
       <BitbucketRepoPicker onChange={jest.fn()} rawErrors={[]} state={state} />,
     );
 
-    expect(getAllByRole('textbox')).toHaveLength(3);
+    expect(getAllByRole('textbox')).toHaveLength(2);
     expect(getAllByRole('textbox')[0]).toHaveValue('lolsWorkspace');
   });
 
@@ -39,7 +39,7 @@ describe('BitbucketRepoPicker', () => {
       <BitbucketRepoPicker onChange={jest.fn()} rawErrors={[]} state={state} />,
     );
 
-    expect(getAllByRole('textbox')).toHaveLength(2);
+    expect(getAllByRole('textbox')).toHaveLength(1);
   });
   describe('workspace field', () => {
     it('calls onChange when the workspace changes', () => {
@@ -78,23 +78,4 @@ describe('BitbucketRepoPicker', () => {
       expect(onChange).toHaveBeenCalledWith({ project: 'test-project' });
     });
   });
-
-  describe('repoName field', () => {
-    it('calls onChange when the repoName changes', () => {
-      const onChange = jest.fn();
-      const { getAllByRole } = render(
-        <BitbucketRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ host: 'bitbucket.org' }}
-        />,
-      );
-
-      const repoNameInput = getAllByRole('textbox')[2];
-
-      fireEvent.change(repoNameInput, { target: { value: 'test-repo' } });
-
-      expect(onChange).toHaveBeenCalledWith({ repoName: 'test-repo' });
-    });
-  });
 });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.test.tsx
index edc6732588..66f0a234be 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.test.tsx
@@ -56,23 +56,4 @@ describe('BitbucketRepoPicker', () => {
       expect(onChange).toHaveBeenCalledWith({ workspace: 'test-parent' });
     });
   });
-
-  describe('repoName field', () => {
-    it('calls onChange when the repoName changes', () => {
-      const onChange = jest.fn();
-      const { getAllByRole } = render(
-        <GerritRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ host: 'gerrithost.org' }}
-        />,
-      );
-
-      const repoNameInput = getAllByRole('textbox')[2];
-
-      fireEvent.change(repoNameInput, { target: { value: 'test-repo' } });
-
-      expect(onChange).toHaveBeenCalledWith({ repoName: 'test-repo' });
-    });
-  });
 });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.test.tsx
index 2c80c40c22..63bc5b8013 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.test.tsx
@@ -84,24 +84,4 @@ describe('GithubRepoPicker', () => {
       expect(onChange).toHaveBeenCalledWith({ owner: 'my-mock-owner' });
     });
   });
-
-  describe('repo name', () => {
-    it('should render free text field for input of repo name', () => {
-      const onChange = jest.fn();
-      const { getAllByRole } = render(
-        <GithubRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ repoName: 'repo' }}
-        />,
-      );
-
-      const repoNameField = getAllByRole('textbox')[1];
-      fireEvent.change(repoNameField, {
-        target: { value: 'my-mock-repo-name' },
-      });
-
-      expect(onChange).toHaveBeenCalledWith({ repoName: 'my-mock-repo-name' });
-    });
-  });
 });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
index 49a91c116e..ad5c7f765e 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
@@ -84,24 +84,4 @@ describe('GitlabRepoPicker', () => {
       expect(onChange).toHaveBeenCalledWith({ owner: 'my-mock-owner' });
     });
   });
-
-  describe('repo name', () => {
-    it('should render free text field for input of repo name', () => {
-      const onChange = jest.fn();
-      const { getAllByRole } = render(
-        <GitlabRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ repoName: 'repo' }}
-        />,
-      );
-
-      const repoNameField = getAllByRole('textbox')[1];
-      fireEvent.change(repoNameField, {
-        target: { value: 'my-mock-repo-name' },
-      });
-
-      expect(onChange).toHaveBeenCalledWith({ repoName: 'my-mock-repo-name' });
-    });
-  });
 });