diff --git a/ui/components/app/create-new-vault/create-new-vault.js b/ui/components/app/create-new-vault/create-new-vault.js
index 13b28eb0a957..81e9e9063c97 100644
--- a/ui/components/app/create-new-vault/create-new-vault.js
+++ b/ui/components/app/create-new-vault/create-new-vault.js
@@ -101,6 +101,7 @@ export default function CreateNewVault({
       <SrpInput onChange={setSeedPhrase} srpText={t('secretRecoveryPhrase')} />
       <div className="create-new-vault__create-password">
         <TextField
+          data-testid="create-vault-password"
           id="password"
           label={t('newPassword')}
           type="password"
@@ -112,6 +113,7 @@ export default function CreateNewVault({
           largeLabel
         />
         <TextField
+          data-testid="create-vault-confirm-password"
           id="confirm-password"
           label={t('confirmPassword')}
           type="password"
@@ -140,6 +142,7 @@ export default function CreateNewVault({
         </div>
       ) : null}
       <Button
+        data-testid="create-new-vault-submit-button"
         className="create-new-vault__submit-button"
         type="primary"
         submit
diff --git a/ui/components/app/create-new-vault/create-new-vault.test.js b/ui/components/app/create-new-vault/create-new-vault.test.js
index 6f01804e0d37..34cdc005f3e6 100644
--- a/ui/components/app/create-new-vault/create-new-vault.test.js
+++ b/ui/components/app/create-new-vault/create-new-vault.test.js
@@ -1,10 +1,13 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
-import { renderWithProvider } from '../../../../test/jest';
+import { screen, fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
 import CreateNewVault from './create-new-vault';
 
+const TEST_SEED =
+  'debris dizzy just program just float decrease vacant alarm reduce speak stadium';
+
 const store = configureStore({
   metamask: {
     ...mockState.metamask,
@@ -13,13 +16,16 @@ const store = configureStore({
 
 describe('CreateNewVault', () => {
   it('renders CreateNewVault component and shows Secret Recovery Phrase text', () => {
-    renderWithProvider(<CreateNewVault submitText="Import" />, store);
+    renderWithProvider(
+      <CreateNewVault submitText="Import" onSubmit={jest.fn()} />,
+      store,
+    );
     expect(screen.getByText('Secret Recovery Phrase')).toBeInTheDocument();
   });
 
   it('renders CreateNewVault component and shows You can paste... text', () => {
     renderWithProvider(
-      <CreateNewVault submitText="Import" includeTerms />,
+      <CreateNewVault submitText="Import" onSubmit={jest.fn()} includeTerms />,
       store,
     );
     expect(
@@ -28,4 +34,139 @@ describe('CreateNewVault', () => {
       ),
     ).toBeInTheDocument();
   });
+
+  it('should check terms', () => {
+    const props = {
+      onSubmit: jest.fn(),
+      submitText: 'Submit',
+      includeTerms: true,
+    };
+
+    const { queryByTestId } = renderWithProvider(
+      <CreateNewVault {...props} />,
+      store,
+    );
+
+    const terms = queryByTestId('create-new-vault__terms-checkbox');
+
+    fireEvent.click(terms);
+
+    expect(terms).toBeChecked();
+  });
+
+  it('should error with password length is less than 8', () => {
+    const props = {
+      onSubmit: jest.fn(),
+      submitText: 'Submit',
+    };
+
+    const { queryByTestId, queryByText } = renderWithProvider(
+      <CreateNewVault {...props} />,
+      store,
+    );
+
+    const passwordInput = queryByTestId('create-vault-password');
+
+    const passwordEvent = {
+      target: {
+        value: '1234567',
+      },
+    };
+
+    fireEvent.change(passwordInput, passwordEvent);
+
+    const passwordError = queryByText('Password not long enough');
+
+    expect(passwordError).toBeInTheDocument();
+
+    const submitButton = queryByTestId('create-new-vault-submit-button');
+
+    expect(submitButton).toBeDisabled();
+  });
+
+  it('should error with password and confirm password mismatch', () => {
+    const props = {
+      onSubmit: jest.fn(),
+      submitText: 'Submit',
+    };
+
+    const { queryByTestId, queryByText } = renderWithProvider(
+      <CreateNewVault {...props} />,
+      store,
+    );
+
+    const passwordInput = queryByTestId('create-vault-password');
+    const confirmPasswordInput = queryByTestId('create-vault-confirm-password');
+
+    const passwordEvent = {
+      target: {
+        value: '12345678',
+      },
+    };
+
+    const confirmPasswordEvent = {
+      target: {
+        value: 'abcdefgh',
+      },
+    };
+
+    fireEvent.change(passwordInput, passwordEvent);
+    fireEvent.change(confirmPasswordInput, confirmPasswordEvent);
+
+    const passwordError = queryByText(`Passwords don't match`);
+
+    expect(passwordError).toBeInTheDocument();
+
+    const submitButton = queryByTestId('create-new-vault-submit-button');
+
+    expect(submitButton).toBeDisabled();
+  });
+
+  it('should valid', () => {
+    const props = {
+      onSubmit: jest.fn(),
+      submitText: 'Submit',
+    };
+
+    const { queryByTestId } = renderWithProvider(
+      <CreateNewVault {...props} />,
+      store,
+    );
+
+    inputSRP(TEST_SEED, queryByTestId);
+
+    const passwordInput = queryByTestId('create-vault-password');
+    const confirmPasswordInput = queryByTestId('create-vault-confirm-password');
+
+    const password = '12345678';
+
+    const passwordEvent = {
+      target: {
+        value: password,
+      },
+    };
+
+    const confirmPasswordEvent = {
+      target: {
+        value: password,
+      },
+    };
+
+    fireEvent.change(passwordInput, passwordEvent);
+    fireEvent.change(confirmPasswordInput, confirmPasswordEvent);
+
+    const submitButton = queryByTestId('create-new-vault-submit-button');
+    expect(submitButton).not.toBeDisabled();
+
+    fireEvent.click(submitButton);
+
+    expect(props.onSubmit).toHaveBeenCalledWith(password, TEST_SEED);
+  });
 });
+
+function inputSRP(seedStr, queryByTestId) {
+  for (const [index, word] of seedStr.split(' ').entries()) {
+    const srpInput = queryByTestId(`import-srp__srp-word-${index}`);
+    fireEvent.change(srpInput, { target: { value: word } });
+  }
+}