diff --git a/app/services/usps_confirmation_maker.rb b/app/services/usps_confirmation_maker.rb
index 1fb164a1597..e9a3ddf8af5 100644
--- a/app/services/usps_confirmation_maker.rb
+++ b/app/services/usps_confirmation_maker.rb
@@ -17,14 +17,14 @@ def perform
   # This method is single statement spread across many lines for readability
   def attributes
     {
-      address1: pii[:address1],
-      address2: pii[:address2],
-      city: pii[:city],
-      otp: pii[:otp],
-      first_name: pii[:first_name],
-      last_name: pii[:last_name],
-      state: pii[:state],
-      zipcode: pii[:zipcode],
+      address1: pii[:address1].norm,
+      address2: pii[:address2].norm,
+      city: pii[:city].norm,
+      otp: pii[:otp].norm,
+      first_name: pii[:first_name].norm,
+      last_name: pii[:last_name].norm,
+      state: pii[:state].norm,
+      zipcode: pii[:zipcode].norm,
       issuer: issuer,
     }
   end
diff --git a/spec/services/usps_exporter_spec.rb b/spec/services/usps_exporter_spec.rb
index 2e4eba2144c..a2da4deee36 100644
--- a/spec/services/usps_exporter_spec.rb
+++ b/spec/services/usps_exporter_spec.rb
@@ -2,18 +2,17 @@
 
 describe UspsExporter do
   let(:export_file) { Tempfile.new('usps_export.psv') }
-  let(:usps_entry) { UspsConfirmationEntry.new_from_hash(pii_attributes) }
   let(:pii_attributes) do
-    {
-      first_name: 'Some',
-      last_name: 'One',
-      address1: '123 Any St',
-      address2: 'Ste 123',
-      city: 'Somewhere',
-      state: 'KS',
-      zipcode: '66666-1234',
-      otp: 123,
-    }
+    Pii::Attributes.new_from_hash(
+      first_name: { raw: 'Söme', norm: 'Some' },
+      last_name: { raw: 'Öne', norm: 'One' },
+      address1: { raw: '123 Añy St', norm: '123 Any St' },
+      address2: { raw: 'Sté 123', norm: 'Ste 123' },
+      city: { raw: 'Sömewhere', norm: 'Somewhere' },
+      state: { raw: 'KS', norm: 'KS' },
+      zipcode: { raw: '66666-1234', norm: '66666-1234' },
+      otp: { raw: 123, norm: 123 }
+    )
   end
   let(:service_provider) { ServiceProvider.from_issuer('http://localhost:3000') }
   let(:psv_row_contents) do
@@ -23,13 +22,13 @@
     due_date = due.strftime('%-B %-e')
     values = [
       UspsExporter::CONTENT_ROW_ID,
-      usps_entry.first_name + ' ' + usps_entry.last_name,
-      usps_entry.address1,
-      usps_entry.address2,
-      usps_entry.city,
-      usps_entry.state,
-      usps_entry.zipcode,
-      usps_entry.otp,
+      pii_attributes.first_name.norm + ' ' + pii_attributes.last_name.norm,
+      pii_attributes.address1.norm,
+      pii_attributes.address2.norm,
+      pii_attributes.city.norm,
+      pii_attributes.state.norm,
+      pii_attributes.zipcode.norm,
+      pii_attributes.otp.norm,
       "#{current_date}, #{now.year}",
       "#{due_date}, #{due.year}",
       service_provider.friendly_name,