diff --git a/app/controllers/concerns/idv/verify_info_concern.rb b/app/controllers/concerns/idv/verify_info_concern.rb
index c942a596823..df7432436fb 100644
--- a/app/controllers/concerns/idv/verify_info_concern.rb
+++ b/app/controllers/concerns/idv/verify_info_concern.rb
@@ -212,10 +212,12 @@ def async_state_done(current_async_state)
           previous_ssn_edit_distance: previous_ssn_edit_distance,
           pii_like_keypaths: [
             [:errors, :ssn],
+            [:errors, :state_id_jurisdiction],
             [:proofing_results, :context, :stages, :resolution, :errors, :ssn],
             [:proofing_results, :context, :stages, :residential_address, :errors, :ssn],
             [:proofing_results, :context, :stages, :threatmetrix, :response_body, :first_name],
             [:proofing_results, :context, :stages, :state_id, :state_id_jurisdiction],
+            [:proofing_results, :context, :stages, :state_id, :errors, :state_id_jurisdiction],
             [:proofing_results, :biographical_info, :identity_doc_address_state],
             [:proofing_results, :biographical_info, :state_id_jurisdiction],
             [:proofing_results, :biographical_info],
diff --git a/app/controllers/idv/address_controller.rb b/app/controllers/idv/address_controller.rb
index b8b1428fa03..b5902ef6045 100644
--- a/app/controllers/idv/address_controller.rb
+++ b/app/controllers/idv/address_controller.rb
@@ -42,11 +42,13 @@ def self.step_info
 
     def build_address_form
       Idv::AddressForm.new(
-        idv_session.updated_user_address || address_from_document,
+        idv_session.updated_user_address || address_from_document || null_address,
       )
     end
 
     def address_from_document
+      return if idv_session.pii_from_doc.state_id_type == 'passport'
+
       Pii::Address.new(
         address1: idv_session.pii_from_doc.address1,
         address2: idv_session.pii_from_doc.address2,
@@ -56,6 +58,16 @@ def address_from_document
       )
     end
 
+    def null_address
+      Pii::Address.new(
+        address1: nil,
+        address2: nil,
+        city: nil,
+        state: nil,
+        zipcode: nil,
+      )
+    end
+
     def success
       idv_session.address_edited = address_edited?
       idv_session.updated_user_address = @address_form.updated_user_address
diff --git a/app/services/analytics_events.rb b/app/services/analytics_events.rb
index 087dab8728a..508c95fdc75 100644
--- a/app/services/analytics_events.rb
+++ b/app/services/analytics_events.rb
@@ -1969,6 +1969,7 @@ def idv_doc_auth_submitted_image_upload_form(
   # @option extra [Boolean] 'OrientationChanged'
   # @option extra [Boolean] 'PresentationChanged'
   # @param ["Passport","DriversLicense"] document_type Document capture user flow
+  # @param [Hash] passport_check_result The results of the Dos API call
   # The document capture image was uploaded to vendor during the IDV process
   def idv_doc_auth_submitted_image_upload_vendor(
     success:,
@@ -2018,6 +2019,7 @@ def idv_doc_auth_submitted_image_upload_vendor(
     acuant_sdk_upgrade_ab_test_bucket: nil,
     liveness_enabled: nil,
     document_type: nil,
+    passport_check_result: nil,
     **extra
   )
     track_event(
@@ -2069,6 +2071,7 @@ def idv_doc_auth_submitted_image_upload_vendor(
       acuant_sdk_upgrade_ab_test_bucket:,
       liveness_enabled:,
       document_type:,
+      passport_check_result:,
       **extra,
     )
   end
diff --git a/app/services/doc_auth/mock/result_response.rb b/app/services/doc_auth/mock/result_response.rb
index ed7dedb2062..4b8c64e2d5b 100644
--- a/app/services/doc_auth/mock/result_response.rb
+++ b/app/services/doc_auth/mock/result_response.rb
@@ -15,17 +15,18 @@ def initialize(uploaded_file, config, selfie_required = false)
         @selfie_required = selfie_required
         super(
           success: success?,
-          errors: errors,
-          pii_from_doc: pii_from_doc,
+          errors:,
+          pii_from_doc:,
           doc_type_supported: id_type_supported?,
           selfie_live: selfie_live?,
           selfie_quality_good: selfie_quality_good?,
           selfie_status: selfie_status,
           extra: {
-            doc_auth_result: doc_auth_result,
-            portrait_match_results: portrait_match_results,
+            doc_auth_result:,
+            passport_check_result:,
+            portrait_match_results:,
             billed: true,
-            classification_info: classification_info,
+            classification_info:,
             workflow: workflow,
             liveness_checking_required: @selfie_required,
             **@response_info.to_h,
@@ -46,6 +47,7 @@ def errors
             passed = file_data.dig('passed_alerts')
             face_match_result = file_data.dig('portrait_match_results', 'FaceMatchResult')
             classification_info = file_data.dig('classification_info')&.symbolize_keys
+            passport_check_result = file_data.dig('passport_check_result', 'PassportCheckResult')
             # Pass and doc type is ok
             has_fields = [
               doc_auth_result,
@@ -54,6 +56,7 @@ def errors
               passed,
               face_match_result,
               classification_info,
+              passport_check_result,
             ].any?(&:present?)
 
             if has_fields
@@ -70,6 +73,10 @@ def errors
               mock_args[:passed] = passed.map!(&:symbolize_keys) if passed.present?
               mock_args[:liveness_enabled] = face_match_result ? true : false
               mock_args[:classification_info] = classification_info if classification_info.present?
+              if passport_check_result.present?
+                mock_args[:passport_check_result] =
+                  classification_info
+              end
               @response_info = create_response_info(**mock_args)
               ErrorGenerator.new(config).generate_doc_auth_errors(@response_info)
             elsif file_data.include?(:general) # general is the key for errors from parsing
@@ -132,7 +139,15 @@ def parsed_alerts
       end
 
       def parsed_pii_from_doc
-        if parsed_data_from_uploaded_file.has_key?('document')
+        return if !parsed_data_from_uploaded_file.has_key?('document')
+
+        if parsed_data_from_uploaded_file['document']['state_id_type'] == 'passport'
+          Pii::Passport.new(
+            **Idp::Constants::MOCK_IDV_APPLICANT.merge(
+              parsed_data_from_uploaded_file['document'].symbolize_keys,
+            ).slice(*Pii::Passport.members),
+          )
+        else
           Pii::StateId.new(
             **Idp::Constants::MOCK_IDV_APPLICANT.merge(
               parsed_data_from_uploaded_file['document'].symbolize_keys,
@@ -161,6 +176,12 @@ def portrait_match_results
           &.deep_symbolize_keys
       end
 
+      def passport_check_result
+        parsed_data_from_uploaded_file.dig('passport_check_result')
+          &.transform_keys! { |key| key.to_s.camelize }
+          &.deep_symbolize_keys
+      end
+
       def classification_info
         info = parsed_data_from_uploaded_file&.[]('classification_info') || {}
         info.to_h.symbolize_keys
@@ -214,13 +235,14 @@ def parse_uri
       }.freeze
 
       def create_response_info(
-        doc_auth_result: 'Failed',
-        passed: [],
-        failed: DEFAULT_FAILED_ALERTS,
-        liveness_enabled: false,
-        image_metrics: DEFAULT_IMAGE_METRICS,
-        classification_info: nil
-      )
+            doc_auth_result: 'Failed',
+            passed: [],
+            failed: DEFAULT_FAILED_ALERTS,
+            liveness_enabled: false,
+            image_metrics: DEFAULT_IMAGE_METRICS,
+            classification_info: nil,
+            passport_check_result: nil
+          )
         merged_image_metrics = DEFAULT_IMAGE_METRICS.deep_merge(image_metrics)
         {
           vendor: 'Mock',
@@ -234,6 +256,7 @@ def create_response_info(
           liveness_enabled: liveness_enabled,
           classification_info: classification_info,
           portrait_match_results: selfie_check_performed? ? portrait_match_results : nil,
+          passport_check_result:,
         }
       end
     end
diff --git a/app/services/proofing/mock/state_id_mock_client.rb b/app/services/proofing/mock/id_mock_client.rb
similarity index 79%
rename from app/services/proofing/mock/state_id_mock_client.rb
rename to app/services/proofing/mock/id_mock_client.rb
index 3b86f0bff68..377e369d24b 100644
--- a/app/services/proofing/mock/state_id_mock_client.rb
+++ b/app/services/proofing/mock/id_mock_client.rb
@@ -2,9 +2,9 @@
 
 module Proofing
   module Mock
-    class StateIdMockClient
+    class IdMockClient
       SUPPORTED_STATE_ID_TYPES = %w[
-        drivers_license drivers_permit state_id_card
+        drivers_license drivers_permit passport state_id_card
       ].to_set.freeze
 
       INVALID_STATE_ID_NUMBER = '00000000'
@@ -15,12 +15,14 @@ def proof(applicant)
         return mva_timeout_result if mva_timeout?(applicant[:state_id_number])
 
         errors = {}
-        if state_not_supported?(applicant[:state_id_jurisdiction])
+        if jurisdiction_not_supported?(applicant)
           errors[:state_id_jurisdiction] = ['The jurisdiction could not be verified']
         elsif invalid_state_id_number?(applicant[:state_id_number])
           errors[:state_id_number] = ['The state ID number could not be verified']
         elsif invalid_state_id_type?(applicant[:state_id_type])
           errors[:state_id_type] = ['The state ID type could not be verified']
+        elsif bad_mrz?(applicant)
+          errors[:mrz] = ['The passport MRZ could not be verified']
         end
 
         return unverifiable_result(errors) if errors.any?
@@ -63,7 +65,10 @@ def mva_timeout?(state_id_number)
         state_id_number.downcase == TRIGGER_MVA_TIMEOUT
       end
 
-      def state_not_supported?(state_id_jurisdiction)
+      def jurisdiction_not_supported?(applicant)
+        return false if applicant[:state_id_type] == 'passport'
+
+        state_id_jurisdiction = applicant[:state_id_jurisdiction]
         !IdentityConfig.store.aamva_supported_jurisdictions.include? state_id_jurisdiction
       end
 
@@ -75,6 +80,11 @@ def invalid_state_id_type?(state_id_type)
         !SUPPORTED_STATE_ID_TYPES.include?(state_id_type) &&
           !state_id_type.nil?
       end
+
+      def bad_mrz?(applicant)
+        applicant[:state_id_type] == 'passport' &&
+          applicant[:mrz] == 'bad mrz'
+      end
     end
   end
 end
diff --git a/app/services/proofing/resolution/plugins/aamva_plugin.rb b/app/services/proofing/resolution/plugins/aamva_plugin.rb
index 16ed6bc9190..437683b3db3 100644
--- a/app/services/proofing/resolution/plugins/aamva_plugin.rb
+++ b/app/services/proofing/resolution/plugins/aamva_plugin.rb
@@ -66,7 +66,7 @@ def out_of_aamva_jurisdiction_result
         def proofer
           @proofer ||=
             if IdentityConfig.store.proofer_mock_fallback
-              Proofing::Mock::StateIdMockClient.new
+              Proofing::Mock::IdMockClient.new
             else
               Proofing::Aamva::Proofer.new(
                 auth_request_timeout: IdentityConfig.store.aamva_auth_request_timeout,
diff --git a/spec/features/idv/doc_auth/document_capture_spec.rb b/spec/features/idv/doc_auth/document_capture_spec.rb
index a63467283d2..e8830bd37fa 100644
--- a/spec/features/idv/doc_auth/document_capture_spec.rb
+++ b/spec/features/idv/doc_auth/document_capture_spec.rb
@@ -187,6 +187,67 @@
     end
   end
 
+  context 'with a valid passport', allow_browser_log: true do
+    let(:fake_dos_api_endpoint) { 'http://fake_dos_api_endpoint/' }
+
+    before do
+      stub_request(:post, fake_dos_api_endpoint)
+        .to_return(status: 200, body: '{"response" : "YES"}', headers: {})
+
+      allow(IdentityConfig.store).to receive(:dos_passport_mrz_endpoint)
+        .and_return(fake_dos_api_endpoint)
+      visit_idp_from_oidc_sp_with_ial2
+      sign_in_and_2fa_user(@user)
+      complete_doc_auth_steps_before_document_capture_step
+    end
+
+    it 'works' do
+      expect(page).to have_content(t('doc_auth.headings.document_capture'))
+      expect(page).to have_current_path(idv_document_capture_url)
+
+      expect(page).not_to have_content(t('doc_auth.tips.document_capture_selfie_text1'))
+      attach_images(
+        Rails.root.join(
+          'spec', 'fixtures',
+          'passport_credential.yml'
+        ),
+      )
+
+      submit_images
+      expect(page).to have_content(t('doc_auth.headings.capture_complete'))
+    end
+  end
+
+  context 'with an invalid passport', allow_browser_log: true do
+    let(:fake_dos_api_endpoint) { 'http://fake_dos_api_endpoint/' }
+
+    before do
+      stub_request(:post, fake_dos_api_endpoint)
+        .to_return(status: 200, body: '{}', headers: {})
+
+      allow(IdentityConfig.store).to receive(:dos_passport_mrz_endpoint)
+        .and_return(fake_dos_api_endpoint)
+      visit_idp_from_oidc_sp_with_ial2
+      sign_in_and_2fa_user(@user)
+      complete_doc_auth_steps_before_document_capture_step
+    end
+
+    it 'fails' do
+      expect(page).to have_current_path(idv_document_capture_url)
+      expect(page).not_to have_content(t('doc_auth.tips.document_capture_selfie_text1'))
+      attach_images(
+        Rails.root.join(
+          'spec', 'fixtures',
+          'passport_bad_mrz_credential.yml'
+        ),
+      )
+
+      submit_images
+
+      expect(page).not_to have_content(t('doc_auth.headings.capture_complete'))
+    end
+  end
+
   context 'standard desktop flow' do
     before do
       visit_idp_from_oidc_sp_with_ial2
@@ -296,6 +357,7 @@
       end
     end
   end
+
   context 'selfie check' do
     before do
       allow(IdentityConfig.store).to receive(:use_vot_in_sp_requests).and_return(true)
diff --git a/spec/features/idv/doc_auth/verify_info_step_spec.rb b/spec/features/idv/doc_auth/verify_info_step_spec.rb
index 131b034ce74..27f64fd3cf1 100644
--- a/spec/features/idv/doc_auth/verify_info_step_spec.rb
+++ b/spec/features/idv/doc_auth/verify_info_step_spec.rb
@@ -254,7 +254,7 @@
         allow(IdentityConfig.store).to receive(:aamva_supported_jurisdictions).and_return(
           mock_state_id_jurisdiction,
         )
-        expect_any_instance_of(Proofing::Mock::StateIdMockClient).to receive(:proof).with(
+        expect_any_instance_of(Proofing::Mock::IdMockClient).to receive(:proof).with(
           hash_including(
             **Idp::Constants::MOCK_IDV_APPLICANT,
           ),
@@ -271,7 +271,7 @@
           IdentityConfig.store.aamva_supported_jurisdictions -
             mock_state_id_jurisdiction,
         )
-        expect_any_instance_of(Proofing::Mock::StateIdMockClient).to_not receive(:proof)
+        expect_any_instance_of(Proofing::Mock::IdMockClient).to_not receive(:proof)
 
         complete_ssn_step
         complete_verify_step
diff --git a/spec/features/sp_cost_tracking_spec.rb b/spec/features/sp_cost_tracking_spec.rb
index 2bf4a64a083..3d6f92eff6f 100644
--- a/spec/features/sp_cost_tracking_spec.rb
+++ b/spec/features/sp_cost_tracking_spec.rb
@@ -30,7 +30,7 @@
     )
     expect_sp_cost_type(
       5, 2, 'aamva',
-      transaction_id: Proofing::Mock::StateIdMockClient::TRANSACTION_ID
+      transaction_id: Proofing::Mock::IdMockClient::TRANSACTION_ID
     )
     expect_sp_cost_type(6, 2, 'lexis_nexis_address')
   end
diff --git a/spec/fixtures/passport_bad_mrz_credential.yml b/spec/fixtures/passport_bad_mrz_credential.yml
new file mode 100644
index 00000000000..da6f2a8b64c
--- /dev/null
+++ b/spec/fixtures/passport_bad_mrz_credential.yml
@@ -0,0 +1,18 @@
+passport_check_result:
+  # returns the DoS API check result
+  PassportCheckResult: Fail
+doc_auth_result: Failed
+document:
+  first_name: Joe
+  last_name: Dokes
+  middle_name: Q
+  dob: 10/06/1938
+  sex: Male
+  state_id_type: passport
+  mrz: 'P<UTOSAMPLE<<COMPANY<<<<<<<<<<<<<<<<<<<<<<<<ACU1234P<5UTO0003067F4003065<<<<<<<<<<<<<<02'
+  birth_place: birthplace
+  passport_expiration: 2030-03-15
+  issuing_country_code: USA
+  passport_issued: 2015-03-15
+  nationality_code: USA
+  document_number: '000000'
diff --git a/spec/fixtures/passport_credential.yml b/spec/fixtures/passport_credential.yml
new file mode 100644
index 00000000000..119e3094bc9
--- /dev/null
+++ b/spec/fixtures/passport_credential.yml
@@ -0,0 +1,14 @@
+document:
+  first_name: Joe
+  last_name: Dokes
+  middle_name: Q
+  dob: 10/06/1938
+  sex: Male
+  state_id_type: passport
+  mrz: 'P<UTOSAMPLE<<COMPANY<<<<<<<<<<<<<<<<<<<<<<<<ACU1234P<5UTO0003067F4003065<<<<<<<<<<<<<<02'
+  birth_place: birthplace
+  passport_expiration: '2030-03-15'
+  issuing_country_code: USA
+  passport_issued: '2015-03-15'
+  nationality_code: USA
+  document_number: '000000'
diff --git a/spec/services/doc_auth/mock/doc_auth_mock_client_spec.rb b/spec/services/doc_auth/mock/doc_auth_mock_client_spec.rb
index ddfade0d576..f9e2cf5f851 100644
--- a/spec/services/doc_auth/mock/doc_auth_mock_client_spec.rb
+++ b/spec/services/doc_auth/mock/doc_auth_mock_client_spec.rb
@@ -6,6 +6,7 @@
   let(:liveness_checking_required) { false }
 
   let(:instance_id) { 'fake-instance-id' }
+
   it 'allows doc auth without any external requests' do
     post_front_image_response = client.post_front_image(
       instance_id: instance_id,
@@ -49,6 +50,72 @@
     )
   end
 
+  context 'when given passport yaml' do
+    let(:passport_yaml) { 'needs to be set' }
+
+    let(:post_front_image_response) do
+      client.post_front_image(
+        instance_id: instance_id,
+        image: passport_yaml,
+      )
+    end
+
+    let(:post_back_image_response) do
+      client.post_back_image(
+        instance_id: instance_id,
+        image: passport_yaml,
+      )
+    end
+
+    let(:get_results_response) do
+      client.get_results(
+        instance_id: instance_id,
+      )
+    end
+
+    let(:expected_pii_hash) do
+      Pii::Passport.new(
+        first_name: 'Joe',
+        last_name: 'Dokes',
+        middle_name: 'Q',
+        dob: '1938-10-06',
+        sex: 'Male',
+        birth_place: 'birthplace',
+        passport_expiration: '2030-03-15',
+        issuing_country_code: 'USA',
+        # rubocop:disable Layout/LineLength
+        mrz: 'P<UTOSAMPLE<<COMPANY<<<<<<<<<<<<<<<<<<<<<<<<ACU1234P<5UTO0003067F4003065<<<<<<<<<<<<<<02',
+        # rubocop:enable Layout/LineLength
+        passport_issued: '2015-03-15',
+        nationality_code: 'USA',
+        document_number: '000000',
+        state_id_type: 'passport',
+      ).to_h
+    end
+
+    context 'for a valid passport' do
+      let(:passport_yaml) { DocAuthImageFixtures.passport_passed_yaml.read }
+
+      it 'passes' do
+        expect(post_front_image_response.success?).to eq(true)
+        expect(post_back_image_response.success?).to eq(true)
+        expect(get_results_response.success?).to eq(true)
+        expect(get_results_response.pii_from_doc.to_h).to eq(expected_pii_hash)
+      end
+    end
+
+    context 'when given a passport with a bad MRZ' do
+      let(:passport_yaml) { DocAuthImageFixtures.passport_failed_yaml.read }
+
+      it 'fails' do
+        expect(post_front_image_response.success?).to eq(true)
+        expect(post_back_image_response.success?).to eq(true)
+        expect(get_results_response.success?).to eq(false)
+        expect(get_results_response.pii_from_doc.to_h).to eq(expected_pii_hash)
+      end
+    end
+  end
+
   it 'if the document is a YAML file it returns the PII from the YAML file' do
     yaml = <<~YAML
       document:
@@ -191,6 +258,7 @@
     expect(errors[:hints]).to eq(true)
     expect(get_results_response.extra[:classification_info]).to include(:Front, :Back)
   end
+
   it 'allows responses to be mocked' do
     response = DocAuth::Response.new(
       success: true,
diff --git a/spec/services/doc_auth/mock/result_response_spec.rb b/spec/services/doc_auth/mock/result_response_spec.rb
index 2abe9c95262..a25ac18f6fb 100644
--- a/spec/services/doc_auth/mock/result_response_spec.rb
+++ b/spec/services/doc_auth/mock/result_response_spec.rb
@@ -338,6 +338,7 @@
         classification_info: {},
         workflow: 'test_non_liveness_workflow',
         liveness_checking_required: false,
+        passport_check_result: nil,
         portrait_match_results: nil,
       )
       expect(response.doc_auth_success?).to eq(true)
@@ -421,6 +422,7 @@
         portrait_match_results: nil,
         alert_failure_count: 1,
         liveness_enabled: false,
+        passport_check_result: nil,
         vendor: 'Mock',
         processed_alerts: {
           failed: [{ name: '2D Barcode Read', result: 'Failed' }],
@@ -470,6 +472,7 @@
         portrait_match_results: nil,
         alert_failure_count: 1,
         liveness_enabled: false,
+        passport_check_result: nil,
         vendor: 'Mock',
         processed_alerts: {
           failed: [{ name: '2D Barcode Read', result: 'Failed' }],
@@ -553,6 +556,7 @@
         classification_info: {},
         liveness_checking_required: false,
         workflow: 'test_non_liveness_workflow',
+        passport_check_result: nil,
         portrait_match_results: nil,
       )
     end
diff --git a/spec/services/idv/agent_spec.rb b/spec/services/idv/agent_spec.rb
index cf999e53829..dafebaae7cd 100644
--- a/spec/services/idv/agent_spec.rb
+++ b/spec/services/idv/agent_spec.rb
@@ -74,7 +74,7 @@
         context 'when resolution succeeds' do
           it 'proofs state_id' do
             expect(result[:context][:stages][:state_id]).to include(
-              transaction_id: Proofing::Mock::StateIdMockClient::TRANSACTION_ID,
+              transaction_id: Proofing::Mock::IdMockClient::TRANSACTION_ID,
               errors: {},
               exception: nil,
               success: true,
@@ -107,7 +107,7 @@
           it 'does not proof state_id' do
             expect(result[:context][:stages]).to_not include(
               state_id: 'StateIdMock',
-              transaction_id: Proofing::Mock::StateIdMockClient::TRANSACTION_ID,
+              transaction_id: Proofing::Mock::IdMockClient::TRANSACTION_ID,
             )
           end
         end
@@ -170,7 +170,7 @@
 
         it 'returns a successful result if resolution passes' do
           expect(result[:context][:stages][:state_id]).to include(
-            transaction_id: Proofing::Mock::StateIdMockClient::TRANSACTION_ID,
+            transaction_id: Proofing::Mock::IdMockClient::TRANSACTION_ID,
             errors: {},
             exception: nil,
             success: true,
diff --git a/spec/services/proofing/mock/id_mock_client_spec.rb b/spec/services/proofing/mock/id_mock_client_spec.rb
new file mode 100644
index 00000000000..ccc121262bd
--- /dev/null
+++ b/spec/services/proofing/mock/id_mock_client_spec.rb
@@ -0,0 +1,153 @@
+require 'rails_helper'
+
+RSpec.describe Proofing::Mock::IdMockClient do
+  let(:transaction_id) { 'state-id-mock-transaction-id-456' }
+
+  describe '#proof' do
+    context 'with a state id' do
+      let(:applicant) { Idp::Constants::MOCK_IDV_APPLICANT_WITH_SSN.merge(uuid: '1234-abcd') }
+
+      subject { described_class.new }
+
+      context 'with good info' do
+        it 'returns a passing result' do
+          result = subject.proof(applicant)
+
+          expect(result.success?).to eq(true)
+          expect(result.errors).to eq({})
+          expect(result.transaction_id).to eq(transaction_id)
+          expect(result.to_h).to eq(
+            success: true,
+            errors: {},
+            exception: nil,
+            mva_exception: nil,
+            requested_attributes: {},
+            timed_out: false,
+            transaction_id: transaction_id,
+            vendor_name: 'StateIdMock',
+            verified_attributes: [],
+            jurisdiction_in_maintenance_window: false,
+          )
+        end
+      end
+
+      context 'with info that triggers a failure to match' do
+        it 'returns a failed to match result' do
+          applicant[:state_id_number] = '00000000'
+
+          result = subject.proof(applicant)
+
+          expect(result.success?).to eq(false)
+          expect(result.errors).to eq(
+            state_id_number: ['The state ID number could not be verified'],
+          )
+          expect(result.transaction_id).to eq(transaction_id)
+          expect(result.to_h).to eq(
+            success: false,
+            errors: {
+              state_id_number: ['The state ID number could not be verified'],
+            },
+            exception: nil,
+            mva_exception: nil,
+            requested_attributes: {},
+            timed_out: false,
+            transaction_id: transaction_id,
+            vendor_name: 'StateIdMock',
+            verified_attributes: [],
+            jurisdiction_in_maintenance_window: false,
+          )
+        end
+      end
+
+      context 'with info that triggers an error' do
+        it 'returns an error result' do
+          applicant[:state_id_number] = 'mvatimeout'
+
+          result = subject.proof(applicant)
+
+          expect(result.success?).to eq(false)
+          expect(result.errors).to eq({})
+          expect(result.transaction_id).to eq(transaction_id)
+          expect(result.to_h).to match(
+            success: false,
+            errors: {},
+            exception: an_instance_of(Proofing::TimeoutError),
+            mva_exception: true,
+            requested_attributes: {},
+            timed_out: true,
+            transaction_id: transaction_id,
+            vendor_name: 'StateIdMock',
+            verified_attributes: [],
+            jurisdiction_in_maintenance_window: false,
+          )
+        end
+      end
+
+      context 'with a nil state id number' do
+        it 'returns a good result' do
+          applicant[:state_id_number] = nil
+
+          result = subject.proof(applicant)
+
+          expect(result.success?).to eq(true)
+          expect(result.errors).to eq({})
+        end
+      end
+    end
+
+    context 'with a passport' do
+      let(:applicant) { Idp::Constants::MOCK_IDV_APPLICANT_WITH_PASSPORT.merge(uuid: '1234-abcd') }
+
+      subject { described_class.new }
+
+      context 'with good info' do
+        it 'returns a passing result' do
+          result = subject.proof(applicant)
+
+          expect(result.errors).to eq({})
+          expect(result.success?).to eq(true)
+          expect(result.to_h).to eq(
+            success: true,
+            errors: {},
+            exception: nil,
+            mva_exception: nil,
+            transaction_id:,
+            requested_attributes: {},
+            timed_out: false,
+            vendor_name: 'StateIdMock',
+            verified_attributes: [],
+            jurisdiction_in_maintenance_window: false,
+          )
+        end
+      end
+
+      context 'with an invalid mrz' do
+        it 'returns a failed to match result' do
+          applicant[:mrz] = 'bad mrz'
+
+          result = subject.proof(applicant)
+
+          expect(result.success?).to eq(false)
+          expect(result.errors).to eq(
+            mrz: ['The passport MRZ could not be verified'],
+          )
+          expect(result.transaction_id).to eq(transaction_id)
+          expect(result.to_h).to eq(
+            success: false,
+            errors: {
+              mrz: ['The passport MRZ could not be verified'],
+            },
+            exception: nil,
+            mva_exception: nil,
+            requested_attributes: {},
+            timed_out: false,
+            transaction_id:,
+            vendor_name: 'StateIdMock',
+            verified_attributes: [],
+            jurisdiction_in_maintenance_window: false,
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/proofing/mock/state_id_mock_client_spec.rb b/spec/services/proofing/mock/state_id_mock_client_spec.rb
deleted file mode 100644
index 6615ac2ec5b..00000000000
--- a/spec/services/proofing/mock/state_id_mock_client_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Proofing::Mock::StateIdMockClient do
-  describe '#proof' do
-    let(:applicant) { Idp::Constants::MOCK_IDV_APPLICANT_WITH_SSN.merge(uuid: '1234-abcd') }
-    let(:transaction_id) { 'state-id-mock-transaction-id-456' }
-
-    subject { described_class.new }
-
-    context 'with good info' do
-      it 'returns a passing result' do
-        result = subject.proof(applicant)
-
-        expect(result.success?).to eq(true)
-        expect(result.errors).to eq({})
-        expect(result.transaction_id).to eq(transaction_id)
-        expect(result.to_h).to eq(
-          success: true,
-          errors: {},
-          exception: nil,
-          mva_exception: nil,
-          requested_attributes: {},
-          timed_out: false,
-          transaction_id: transaction_id,
-          vendor_name: 'StateIdMock',
-          verified_attributes: [],
-          jurisdiction_in_maintenance_window: false,
-        )
-      end
-    end
-
-    context 'with info that triggers a failure to match' do
-      it 'returns a failed to match result' do
-        applicant[:state_id_number] = '00000000'
-
-        result = subject.proof(applicant)
-
-        expect(result.success?).to eq(false)
-        expect(result.errors).to eq(state_id_number: ['The state ID number could not be verified'])
-        expect(result.transaction_id).to eq(transaction_id)
-        expect(result.to_h).to eq(
-          success: false,
-          errors: {
-            state_id_number: ['The state ID number could not be verified'],
-          },
-          exception: nil,
-          mva_exception: nil,
-          requested_attributes: {},
-          timed_out: false,
-          transaction_id: transaction_id,
-          vendor_name: 'StateIdMock',
-          verified_attributes: [],
-          jurisdiction_in_maintenance_window: false,
-        )
-      end
-    end
-
-    context 'with info that triggers an error' do
-      it 'returns an error result' do
-        applicant[:state_id_number] = 'mvatimeout'
-
-        result = subject.proof(applicant)
-
-        expect(result.success?).to eq(false)
-        expect(result.errors).to eq({})
-        expect(result.transaction_id).to eq(transaction_id)
-        expect(result.to_h).to match(
-          success: false,
-          errors: {},
-          exception: an_instance_of(Proofing::TimeoutError),
-          mva_exception: true,
-          requested_attributes: {},
-          timed_out: true,
-          transaction_id: transaction_id,
-          vendor_name: 'StateIdMock',
-          verified_attributes: [],
-          jurisdiction_in_maintenance_window: false,
-        )
-      end
-    end
-
-    context 'with a nil state id number' do
-      it 'returns a good result' do
-        applicant[:state_id_number] = nil
-
-        result = subject.proof(applicant)
-
-        expect(result.success?).to eq(true)
-        expect(result.errors).to eq({})
-      end
-    end
-  end
-end
diff --git a/spec/support/doc_auth_image_fixtures.rb b/spec/support/doc_auth_image_fixtures.rb
index 188e3f3d4d7..025c2315e47 100644
--- a/spec/support/doc_auth_image_fixtures.rb
+++ b/spec/support/doc_auth_image_fixtures.rb
@@ -63,6 +63,22 @@ def self.portrait_match_fail_yaml
     Rack::Test::UploadedFile.new(path, Mime[:yaml])
   end
 
+  def self.passport_passed_yaml
+    path = File.join(
+      File.dirname(__FILE__),
+      '../fixtures/passport_credential.yml',
+    )
+    Rack::Test::UploadedFile.new(path, Mime[:yaml])
+  end
+
+  def self.passport_failed_yaml
+    path = File.join(
+      File.dirname(__FILE__),
+      '../fixtures/passport_bad_mrz_credential.yml',
+    )
+    Rack::Test::UploadedFile.new(path, Mime[:yaml])
+  end
+
   def self.fixture_path(filename)
     File.join(
       File.dirname(__FILE__),