diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb
index db6dd28a4..d7e11cb00 100644
--- a/spec/factories/case_log.rb
+++ b/spec/factories/case_log.rb
@@ -12,8 +12,8 @@ FactoryBot.define do
     trait :in_progress do
       status { 1 }
       tenant_code { "TH356" }
-      postcode_full { "PO5 3TE" }
-      ppostcode_full { "SW2 6HI" }
+      postcode_full { Faker::Address.postcode }
+      ppostcode_full { Faker::Address.postcode }
       age1 { 17 }
       age2 { 19 }
     end
@@ -56,7 +56,7 @@ FactoryBot.define do
       startertenancy { 0 }
       tenancylength { 5 }
       tenancy { 1 }
-      ppostcode_full { "SE2 6RT" }
+      ppostcode_full { Faker::Address.postcode }
       rsnvac { 6 }
       unittype_gn { 7 }
       beds { 3 }
@@ -74,7 +74,7 @@ FactoryBot.define do
       tcharge { 325 }
       layear { 2 }
       waityear { 1 }
-      postcode_full { "NW1 5TY" }
+      postcode_full { Faker::Address.postcode }
       reasonpref { 1 }
       cbl { 1 }
       chr { 1 }
diff --git a/spec/features/form/saving_data_spec.rb b/spec/features/form/saving_data_spec.rb
index 9e8d09f58..863d906e7 100644
--- a/spec/features/form/saving_data_spec.rb
+++ b/spec/features/form/saving_data_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe "Form Saving Data" do
 
   it "displays number answers in inputs if they are already saved" do
     visit("/logs/#{id}/property-postcode")
-    expect(page).to have_field("case-log-postcode-full-field", with: "PO53TE")
+    expect(page).to have_field("case-log-postcode-full-field", with: case_log.postcode_full)
   end
 
   it "displays text answers in inputs if they are already saved" do
diff --git a/spec/services/exports/case_log_export_service_spec.rb b/spec/services/exports/case_log_export_service_spec.rb
index ab59a7309..601e1f8eb 100644
--- a/spec/services/exports/case_log_export_service_spec.rb
+++ b/spec/services/exports/case_log_export_service_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Exports::CaseLogExportService do
     end
 
     context "and one case log is available for export" do
-      let!(:case_log) { FactoryBot.create(:case_log, :completed, tenancy_code: "BZ757", propcode: "123") }
+      let!(:case_log) { FactoryBot.create(:case_log, :completed, tenancy_code: "BZ757", propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY") }
       let(:expected_data_filename) { "core_2021_2022_jan_mar_f0001_inc0001_pt001.xml" }
 
       it "generates a ZIP export file with the expected filename" do