diff --git a/app/javascript/packages/document-capture/components/full-address-search-input.tsx b/app/javascript/packages/document-capture/components/full-address-search-input.tsx
new file mode 100644
index 00000000000..e81c5f9f771
--- /dev/null
+++ b/app/javascript/packages/document-capture/components/full-address-search-input.tsx
@@ -0,0 +1,177 @@
+import { TextInput, SelectInput } from '@18f/identity-components';
+import type { FormattedLocation, LocationQuery } from '@18f/identity-address-search/types';
+import type { RegisterFieldCallback } from '@18f/identity-form-steps';
+import { useDidUpdateEffect } from '@18f/identity-react-hooks';
+import { SpinnerButtonRefHandle, SpinnerButton } from '@18f/identity-spinner-button';
+import { ValidatedField } from '@18f/identity-validated-field';
+import { t } from '@18f/identity-i18n';
+import { useCallback, useContext, useEffect, useRef, useState } from 'react';
+import { InPersonContext } from '../context';
+import useValidatedUspsLocations from '../hooks/use-validated-usps-locations';
+
+interface FullAddressSearchProps {
+  registerField?: RegisterFieldCallback;
+  onFoundLocations?: (
+    address: LocationQuery | null,
+    locations: FormattedLocation[] | null | undefined,
+  ) => void;
+  onLoadingLocations?: (isLoading: boolean) => void;
+  onError?: (error: Error | null) => void;
+  disabled?: boolean;
+  locationsURL: string;
+}
+
+export default function FullAddressSearchInput({
+  registerField = () => undefined,
+  onFoundLocations = () => undefined,
+  onLoadingLocations = () => undefined,
+  onError = () => undefined,
+  disabled = false,
+  locationsURL,
+}: FullAddressSearchProps) {
+  const spinnerButtonRef = useRef<SpinnerButtonRefHandle>(null);
+  const [addressValue, setAddressValue] = useState('');
+  const [cityValue, setCityValue] = useState('');
+  const [stateValue, setStateValue] = useState('');
+  const [zipCodeValue, setZipCodeValue] = useState('');
+  const {
+    locationQuery,
+    locationResults,
+    uspsError,
+    isLoading,
+    handleLocationSearch: onSearch,
+    validatedAddressFieldRef,
+    validatedCityFieldRef,
+    validatedStateFieldRef,
+    validatedZipCodeFieldRef,
+  } = useValidatedUspsLocations(locationsURL);
+
+  const inputChangeHandler =
+    <T extends HTMLElement & { value: string }>(input) =>
+    (event: React.ChangeEvent<T>) => {
+      const { target } = event;
+      input(target.value);
+    };
+
+  type SelectChangeEvent = React.ChangeEvent<HTMLSelectElement>;
+
+  const onAddressChange = inputChangeHandler(setAddressValue);
+  const onCityChange = inputChangeHandler(setCityValue);
+  const onStateChange = (e: SelectChangeEvent) => setStateValue(e.target.value);
+  const onZipCodeChange = inputChangeHandler(setZipCodeValue);
+
+  useEffect(() => {
+    spinnerButtonRef.current?.toggleSpinner(isLoading);
+    onLoadingLocations(isLoading);
+  }, [isLoading]);
+
+  useEffect(() => {
+    uspsError && onError(uspsError);
+  }, [uspsError]);
+
+  useDidUpdateEffect(() => {
+    onFoundLocations(locationQuery, locationResults);
+  }, [locationResults]);
+
+  const handleSearch = useCallback(
+    (event) => {
+      onError(null);
+      onSearch(event, addressValue, cityValue, stateValue, zipCodeValue);
+    },
+    [addressValue, cityValue, stateValue, zipCodeValue],
+  );
+
+  const { usStatesTerritories } = useContext(InPersonContext);
+
+  return (
+    <>
+      <ValidatedField
+        ref={validatedAddressFieldRef}
+        messages={{
+          patternMismatch: t('simple_form.required.text'),
+        }}
+      >
+        <TextInput
+          required
+          ref={registerField('address')}
+          value={addressValue}
+          onChange={onAddressChange}
+          label={t('in_person_proofing.body.location.po_search.address_label')}
+          disabled={disabled}
+          maxLength={255}
+          pattern=".*\S.*$"
+        />
+      </ValidatedField>
+      <ValidatedField
+        ref={validatedCityFieldRef}
+        messages={{
+          patternMismatch: t('simple_form.required.text'),
+        }}
+      >
+        <TextInput
+          required
+          ref={registerField('city')}
+          value={cityValue}
+          onChange={onCityChange}
+          label={t('in_person_proofing.body.location.po_search.city_label')}
+          disabled={disabled}
+          maxLength={50}
+          pattern=".*\S.*$"
+        />
+      </ValidatedField>
+      <ValidatedField ref={validatedStateFieldRef}>
+        <SelectInput
+          required
+          ref={registerField('state')}
+          value={stateValue}
+          onChange={onStateChange}
+          label={t('in_person_proofing.body.location.po_search.state_label')}
+          disabled={disabled}
+        >
+          <option key="select" value="" disabled>
+            {t('in_person_proofing.form.address.state_prompt')}
+          </option>
+          {usStatesTerritories.map(([name, abbr]) => (
+            <option key={abbr} value={abbr}>
+              {name}
+            </option>
+          ))}
+        </SelectInput>
+      </ValidatedField>
+      <ValidatedField
+        ref={validatedZipCodeFieldRef}
+        messages={{
+          patternMismatch: t('idv.errors.pattern_mismatch.zipcode_five'),
+        }}
+      >
+        <TextInput
+          required
+          className="tablet:grid-col-5"
+          ref={registerField('zip_code')}
+          value={zipCodeValue}
+          onChange={onZipCodeChange}
+          label={t('in_person_proofing.body.location.po_search.zipcode_label')}
+          disabled={disabled}
+          pattern="^\d{5}$"
+          maxLength={5}
+          minLength={5}
+          type="text"
+        />
+      </ValidatedField>
+      <div className="margin-y-5">
+        <SpinnerButton
+          isWide
+          isBig
+          ref={spinnerButtonRef}
+          type="submit"
+          onClick={handleSearch}
+          spinOnClick={false}
+          actionMessage={t('in_person_proofing.body.location.po_search.is_searching_message')}
+          longWaitDurationMs={1}
+        >
+          {t('in_person_proofing.body.location.po_search.search_button')}
+        </SpinnerButton>
+      </div>
+    </>
+  );
+}
diff --git a/app/javascript/packages/document-capture/components/in-person-full-address-search.spec.tsx b/app/javascript/packages/document-capture/components/in-person-full-address-search.spec.tsx
index 713fe90b93b..d879b20da61 100644
--- a/app/javascript/packages/document-capture/components/in-person-full-address-search.spec.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-full-address-search.spec.tsx
@@ -16,7 +16,13 @@ describe('FullAddressSearch', () => {
       const handleLocationsFound = sandbox.stub();
       const { findByText, findAllByText } = render(
         <SWRConfig value={{ provider: () => new Map() }}>
-          <FullAddressSearch onFoundLocations={handleLocationsFound} locationsURL={LOCATIONS_URL} />
+          <FullAddressSearch
+            onFoundLocations={handleLocationsFound}
+            locationsURL={LOCATIONS_URL}
+            registerField={undefined}
+            handleLocationSelect={undefined}
+            disabled={undefined}
+          />
         </SWRConfig>,
       );
 
@@ -32,7 +38,13 @@ describe('FullAddressSearch', () => {
       const handleLocationsFound = sandbox.stub();
       const { findByText, findByLabelText, findAllByText } = render(
         <SWRConfig value={{ provider: () => new Map() }}>
-          <FullAddressSearch onFoundLocations={handleLocationsFound} locationsURL={LOCATIONS_URL} />
+          <FullAddressSearch
+            onFoundLocations={handleLocationsFound}
+            locationsURL={LOCATIONS_URL}
+            registerField={undefined}
+            handleLocationSelect={undefined}
+            disabled={undefined}
+          />
         </SWRConfig>,
       );
 
@@ -64,7 +76,13 @@ describe('FullAddressSearch', () => {
       const handleLocationsFound = sandbox.stub();
       const { findByText, findByLabelText, queryByText } = render(
         <SWRConfig value={{ provider: () => new Map() }}>
-          <FullAddressSearch onFoundLocations={handleLocationsFound} locationsURL={LOCATIONS_URL} />
+          <FullAddressSearch
+            onFoundLocations={handleLocationsFound}
+            locationsURL={LOCATIONS_URL}
+            registerField={undefined}
+            handleLocationSelect={undefined}
+            disabled={undefined}
+          />
         </SWRConfig>,
       );
 
@@ -109,7 +127,13 @@ describe('FullAddressSearch', () => {
       const handleLocationsFound = sandbox.stub();
       const { findByText, findByLabelText } = render(
         <SWRConfig value={{ provider: () => new Map() }}>
-          <FullAddressSearch onFoundLocations={handleLocationsFound} locationsURL={LOCATIONS_URL} />
+          <FullAddressSearch
+            onFoundLocations={handleLocationsFound}
+            locationsURL={LOCATIONS_URL}
+            registerField={undefined}
+            handleLocationSelect={undefined}
+            disabled={undefined}
+          />
         </SWRConfig>,
       );
 
diff --git a/app/javascript/packages/document-capture/components/in-person-full-address-search.tsx b/app/javascript/packages/document-capture/components/in-person-full-address-search.tsx
index 0f3d3639feb..1cbd826ed70 100644
--- a/app/javascript/packages/document-capture/components/in-person-full-address-search.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-full-address-search.tsx
@@ -1,177 +1,55 @@
-import { TextInput, SelectInput } from '@18f/identity-components';
-import { useState, useRef, useEffect, useCallback, useContext } from 'react';
+import { Alert, PageHeading } from '@18f/identity-components';
+import { useState } from 'react';
 import { t } from '@18f/identity-i18n';
-import ValidatedField from '@18f/identity-validated-field/validated-field';
-import SpinnerButton, { SpinnerButtonRefHandle } from '@18f/identity-spinner-button/spinner-button';
-import type { RegisterFieldCallback } from '@18f/identity-form-steps';
-import { useDidUpdateEffect } from '@18f/identity-react-hooks';
+import { InPersonLocations } from '@18f/identity-address-search';
 import type { LocationQuery, FormattedLocation } from '@18f/identity-address-search/types';
-import { InPersonContext } from '../context';
-import useValidatedUspsLocations from '../hooks/use-validated-usps-locations';
-
-interface FullAddressSearchProps {
-  registerField?: RegisterFieldCallback;
-  onFoundLocations?: (
-    address: LocationQuery | null,
-    locations: FormattedLocation[] | null | undefined,
-  ) => void;
-  onLoadingLocations?: (isLoading: boolean) => void;
-  onError?: (error: Error | null) => void;
-  disabled?: boolean;
-  locationsURL: string;
-}
+import FullAddressSearchInput from './full-address-search-input';
 
 function FullAddressSearch({
-  registerField = () => undefined,
-  onFoundLocations = () => undefined,
-  onLoadingLocations = () => undefined,
-  onError = () => undefined,
-  disabled = false,
+  registerField,
   locationsURL,
-}: FullAddressSearchProps) {
-  const spinnerButtonRef = useRef<SpinnerButtonRefHandle>(null);
-  const [addressValue, setAddressValue] = useState('');
-  const [cityValue, setCityValue] = useState('');
-  const [stateValue, setStateValue] = useState('');
-  const [zipCodeValue, setZipCodeValue] = useState('');
-  const {
-    locationQuery,
-    locationResults,
-    uspsError,
-    isLoading,
-    handleLocationSearch: onSearch,
-    validatedAddressFieldRef,
-    validatedCityFieldRef,
-    validatedStateFieldRef,
-    validatedZipCodeFieldRef,
-  } = useValidatedUspsLocations(locationsURL);
-
-  const inputChangeHandler =
-    <T extends HTMLElement & { value: string }>(input) =>
-    (event: React.ChangeEvent<T>) => {
-      const { target } = event;
-      input(target.value);
-    };
-
-  type SelectChangeEvent = React.ChangeEvent<HTMLSelectElement>;
-
-  const onAddressChange = inputChangeHandler(setAddressValue);
-  const onCityChange = inputChangeHandler(setCityValue);
-  const onStateChange = (e: SelectChangeEvent) => setStateValue(e.target.value);
-  const onZipCodeChange = inputChangeHandler(setZipCodeValue);
-
-  useEffect(() => {
-    spinnerButtonRef.current?.toggleSpinner(isLoading);
-    onLoadingLocations(isLoading);
-  }, [isLoading]);
-
-  useEffect(() => {
-    uspsError && onError(uspsError);
-  }, [uspsError]);
-
-  useDidUpdateEffect(() => {
-    onFoundLocations(locationQuery, locationResults);
-  }, [locationResults]);
-
-  const handleSearch = useCallback(
-    (event) => {
-      onError(null);
-      onSearch(event, addressValue, cityValue, stateValue, zipCodeValue);
-    },
-    [addressValue, cityValue, stateValue, zipCodeValue],
+  handleLocationSelect,
+  disabled,
+  onFoundLocations,
+}) {
+  const [apiError, setApiError] = useState<Error | null>(null);
+  const [foundAddress, setFoundAddress] = useState<LocationQuery | null>(null);
+  const [locationResults, setLocationResults] = useState<FormattedLocation[] | null | undefined>(
+    null,
   );
-
-  const { usStatesTerritories } = useContext(InPersonContext);
+  const [isLoadingLocations, setLoadingLocations] = useState<boolean>(false);
 
   return (
     <>
-      <ValidatedField
-        ref={validatedAddressFieldRef}
-        messages={{
-          patternMismatch: t('simple_form.required.text'),
-        }}
-      >
-        <TextInput
-          required
-          ref={registerField('address')}
-          value={addressValue}
-          onChange={onAddressChange}
-          label={t('in_person_proofing.body.location.po_search.address_label')}
-          disabled={disabled}
-          maxLength={255}
-          pattern=".*\S.*$"
-        />
-      </ValidatedField>
-      <ValidatedField
-        ref={validatedCityFieldRef}
-        messages={{
-          patternMismatch: t('simple_form.required.text'),
-        }}
-      >
-        <TextInput
-          required
-          ref={registerField('city')}
-          value={cityValue}
-          onChange={onCityChange}
-          label={t('in_person_proofing.body.location.po_search.city_label')}
-          disabled={disabled}
-          maxLength={50}
-          pattern=".*\S.*$"
-        />
-      </ValidatedField>
-      <ValidatedField ref={validatedStateFieldRef}>
-        <SelectInput
-          required
-          ref={registerField('state')}
-          value={stateValue}
-          onChange={onStateChange}
-          label={t('in_person_proofing.body.location.po_search.state_label')}
-          disabled={disabled}
-        >
-          <option key="select" value="" disabled>
-            {t('in_person_proofing.form.address.state_prompt')}
-          </option>
-          {usStatesTerritories.map(([name, abbr]) => (
-            <option key={abbr} value={abbr}>
-              {name}
-            </option>
-          ))}
-        </SelectInput>
-      </ValidatedField>
-      <ValidatedField
-        ref={validatedZipCodeFieldRef}
-        messages={{
-          patternMismatch: t('idv.errors.pattern_mismatch.zipcode_five'),
+      {apiError && (
+        <Alert type="error" className="margin-bottom-4">
+          {t('idv.failure.exceptions.post_office_search_error')}
+        </Alert>
+      )}
+      <PageHeading>{t('in_person_proofing.headings.po_search.location')}</PageHeading>
+      <p>{t('in_person_proofing.body.location.po_search.po_search_about')}</p>
+      <FullAddressSearchInput
+        registerField={registerField}
+        onFoundLocations={(
+          address: LocationQuery | null,
+          locations: FormattedLocation[] | null | undefined,
+        ) => {
+          setFoundAddress(address);
+          setLocationResults(locations);
+          onFoundLocations(locations);
         }}
-      >
-        <TextInput
-          required
-          className="tablet:grid-col-5"
-          ref={registerField('zip_code')}
-          value={zipCodeValue}
-          onChange={onZipCodeChange}
-          label={t('in_person_proofing.body.location.po_search.zipcode_label')}
-          disabled={disabled}
-          pattern="^\d{5}$"
-          maxLength={5}
-          minLength={5}
-          type="text"
+        onLoadingLocations={setLoadingLocations}
+        onError={setApiError}
+        disabled={disabled}
+        locationsURL={locationsURL}
+      />
+      {locationResults && foundAddress && !isLoadingLocations && (
+        <InPersonLocations
+          locations={locationResults}
+          onSelect={handleLocationSelect}
+          address={foundAddress.address || ''}
         />
-      </ValidatedField>
-      <div className="margin-y-5">
-        <SpinnerButton
-          isWide
-          isBig
-          ref={spinnerButtonRef}
-          type="submit"
-          onClick={handleSearch}
-          spinOnClick={false}
-          actionMessage={t('in_person_proofing.body.location.po_search.is_searching_message')}
-          longWaitDurationMs={1}
-        >
-          {t('in_person_proofing.body.location.po_search.search_button')}
-        </SpinnerButton>
-      </div>
+      )}
     </>
   );
 }
diff --git a/app/javascript/packages/document-capture/components/in-person-location-full-address-entry-post-office-search-step.tsx b/app/javascript/packages/document-capture/components/in-person-location-full-address-entry-post-office-search-step.tsx
index 564c9fdcb0c..1ce97987a37 100644
--- a/app/javascript/packages/document-capture/components/in-person-location-full-address-entry-post-office-search-step.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-location-full-address-entry-post-office-search-step.tsx
@@ -1,10 +1,8 @@
 import { useState, useEffect, useCallback, useRef, useContext } from 'react';
-import { t } from '@18f/identity-i18n';
-import { Alert, PageHeading } from '@18f/identity-components';
 import { request } from '@18f/identity-request';
 import { forceRedirect } from '@18f/identity-url';
-import { transformKeys, snakeCase, InPersonLocations } from '@18f/identity-address-search';
-import type { LocationQuery, FormattedLocation } from '@18f/identity-address-search/types';
+import { transformKeys, snakeCase } from '@18f/identity-address-search';
+import type { FormattedLocation } from '@18f/identity-address-search/types';
 import FullAddressSearch from './in-person-full-address-search';
 import BackButton from './back-button';
 import AnalyticsContext from '../context/analytics';
@@ -19,25 +17,14 @@ function InPersonLocationFullAddressEntryPostOfficeSearchStep({
 }) {
   const { inPersonURL } = useContext(InPersonContext);
   const [inProgress, setInProgress] = useState<boolean>(false);
-  const [isLoadingLocations, setLoadingLocations] = useState<boolean>(false);
   const [autoSubmit, setAutoSubmit] = useState<boolean>(false);
   const { trackEvent } = useContext(AnalyticsContext);
   const [locationResults, setLocationResults] = useState<FormattedLocation[] | null | undefined>(
     null,
   );
-  const [foundAddress, setFoundAddress] = useState<LocationQuery | null>(null);
-  const [apiError, setApiError] = useState<Error | null>(null);
   const [disabledAddressSearch, setDisabledAddressSearch] = useState<boolean>(false);
   const { flowPath } = useContext(UploadContext);
 
-  const onFoundLocations = (
-    address: LocationQuery | null,
-    locations: FormattedLocation[] | null | undefined,
-  ) => {
-    setFoundAddress(address);
-    setLocationResults(locations);
-  };
-
   // ref allows us to avoid a memory leak
   const mountedRef = useRef(false);
 
@@ -105,28 +92,13 @@ function InPersonLocationFullAddressEntryPostOfficeSearchStep({
 
   return (
     <>
-      {apiError && (
-        <Alert type="error" className="margin-bottom-4">
-          {t('idv.failure.exceptions.post_office_search_error')}
-        </Alert>
-      )}
-      <PageHeading>{t('in_person_proofing.headings.po_search.location')}</PageHeading>
-      <p>{t('in_person_proofing.body.location.po_search.po_search_about')}</p>
       <FullAddressSearch
         registerField={registerField}
-        onFoundLocations={onFoundLocations}
-        onLoadingLocations={setLoadingLocations}
-        onError={setApiError}
+        onFoundLocations={setLocationResults}
         disabled={disabledAddressSearch}
         locationsURL={LOCATIONS_URL}
+        handleLocationSelect={handleLocationSelect}
       />
-      {locationResults && foundAddress && !isLoadingLocations && (
-        <InPersonLocations
-          locations={locationResults}
-          onSelect={handleLocationSelect}
-          address={foundAddress.address || ''}
-        />
-      )}
       <BackButton role="link" includeBorder onClick={toPreviousStep} />
     </>
   );