diff --git a/spec/features/user_managing_appearance_releases_spec.rb b/spec/features/user_managing_appearance_releases_spec.rb
index fe7dde8..33e1eb3 100644
--- a/spec/features/user_managing_appearance_releases_spec.rb
+++ b/spec/features/user_managing_appearance_releases_spec.rb
@@ -19,7 +19,7 @@ feature 'User managing appearance releases' do
 
       fill_in person_first_name_field, with: 'Jane'
       fill_in person_last_name_field, with: 'Doe'
-      fill_in person_address_field, with: '123 Test Lane, New York, NY 10000'
+      fill_in_person_address_fields
       fill_in person_phone_field, with: '555-555-5555'
       fill_in person_email_field, with: 'jane.doe@test.com'
       fill_in person_date_of_birth, with: '01/01/1999'
@@ -52,7 +52,7 @@ feature 'User managing appearance releases' do
       fill_in guardian_phone_field, with: '001101'
       fill_in person_first_name_field, with: 'Jane'
       fill_in person_last_name_field, with: 'Doe'
-      fill_in person_address_field, with: '123 Test Lane, New York, NY 10000'
+      fill_in_person_address_fields
       fill_in person_phone_field, with: '555-555-5555'
       fill_in person_email_field, with: 'jane.doe@test.com'
       fill_in person_date_of_birth, with: '01/01/1999'
@@ -65,7 +65,7 @@ feature 'User managing appearance releases' do
       expect(page).to have_content('Guardian email is not an email')
 
       fill_in guardian_email_field, with: 'valid@email.com'
-      fill_in guardian_address_field, with: '123 Test Lane, New York, NY 10000'
+      fill_in_guardian_address_fields
       attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
       draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'
       click_button submit_release_button
@@ -470,8 +470,20 @@ feature 'User managing appearance releases' do
     'Guardian email'
   end
 
-  def guardian_address_field
-    'Guardian address'
+  def guardian_address_street1_field
+    t('helpers.label.appearance_release.guardian_address_street1')
+  end
+
+  def guardian_address_city_field
+    t('helpers.label.appearance_release.guardian_address_city')
+  end
+
+  def guardian_address_state_field
+    t('helpers.label.appearance_release.guardian_address_state')
+  end
+
+  def guardian_address_zip_field
+    t('helpers.label.appearance_release.guardian_address_zip')
   end
 
   def guardian_photo_field
@@ -490,10 +502,36 @@ feature 'User managing appearance releases' do
     t('helpers.label.appearance_release.person_last_name')
   end
 
-  def person_address_field
+  def fill_in_person_address_fields
+    fill_in person_address_street1_field, with: "123 Test Lane"
+    fill_in person_address_city_field, with: "New York"
+    fill_in person_address_state_field, with: "NY"
+    fill_in person_address_zip_field, with: '1000'
+  end
+
+  def fill_in_guardian_address_fields
+    fill_in guardian_address_street1_field, with: "124 Test Lane"
+    fill_in guardian_address_city_field, with: "New York"
+    fill_in guardian_address_state_field, with: "NY"
+    fill_in guardian_address_zip_field, with: '1000'
+  end
+
+  def person_address_street1_field
     t('helpers.label.appearance_release.person_address_street1')
   end
 
+  def person_address_city_field
+    t('helpers.label.appearance_release.person_address_city')
+  end
+
+  def person_address_state_field
+    t('helpers.label.appearance_release.person_address_state')
+  end
+
+  def person_address_zip_field
+    t('helpers.label.appearance_release.person_address_zip')
+  end
+
   def person_email_field
     t('helpers.label.appearance_release.person_email')
   end