diff --git a/test/support/generator/get-geospatial-addresses-generator.ts b/test/support/generator/get-geospatial-addresses-generator.ts
index 69320761..c0ed8415 100644
--- a/test/support/generator/get-geospatial-addresses-generator.ts
+++ b/test/support/generator/get-geospatial-addresses-generator.ts
@@ -14,10 +14,10 @@ export class GetGeospatialAddressesGenerator extends AbstractGenerator<AddressVa
 
   protected generateValues(): AddressValues {
     return {
-      ORGANISATION_NAME: this.valueGenerator.word({ length: 5 }),
+      ORGANISATION_NAME: this.valueGenerator.sentence({ words: 2 }),
       BUILDING_NAME: this.valueGenerator.word(),
       BUILDING_NUMBER: this.valueGenerator.nonnegativeInteger().toString(),
-      THOROUGHFARE_NAME: this.valueGenerator.word({ length: 7 }),
+      THOROUGHFARE_NAME: this.valueGenerator.sentence({ words: 5 }),
       DEPENDENT_LOCALITY: this.valueGenerator.word(),
       POST_TOWN: this.valueGenerator.word(),
       POSTCODE: this.valueGenerator.postcode(),
diff --git a/test/support/generator/random-value-generator.ts b/test/support/generator/random-value-generator.ts
index 929fce0e..c2dedec9 100644
--- a/test/support/generator/random-value-generator.ts
+++ b/test/support/generator/random-value-generator.ts
@@ -36,6 +36,10 @@ export class RandomValueGenerator {
     return this.chance.word({ length: options?.length });
   }
 
+  sentence(options?: { words?: number }): string {
+    return this.chance.sentence({ words: options?.words });
+  }
+
   httpsUrl(): string {
     return this.chance.url({ protocol: 'https' });
   }