diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ContractSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ContractSpec.groovy
index cacdc94ba0..f86d5db8b0 100644
--- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ContractSpec.groovy
+++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ContractSpec.groovy
@@ -107,8 +107,10 @@ class ContractSpec extends Specification {
 			request.with {
 				property = value(consumer(regex("[0-9]{5}")))
 			}
+			def value = Integer.valueOf(property.serverValue as String)
 		then:
-			(property.serverValue as String).matches(/[0-9]{5}/)
+			value >= 0
+			value <= 99_999
 	}
 
 	def 'should set a description'() {
diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/InputSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/InputSpec.groovy
index 5c93855d1a..6fae3a4545 100644
--- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/InputSpec.groovy
+++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/InputSpec.groovy
@@ -14,7 +14,9 @@ class InputSpec extends Specification {
 			input.with {
 				property = $(consumer(regex("[0-9]{5}")))
 			}
+			def value = Integer.valueOf(property.serverValue as String)
 		then:
-			(property.serverValue as String).matches(/[0-9]{5}/)
+			value >= 0
+			value <= 99_999
 	}
 }
diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/OutputMessageSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/OutputMessageSpec.groovy
index 2a1da4d1ac..0f45924ee1 100644
--- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/OutputMessageSpec.groovy
+++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/OutputMessageSpec.groovy
@@ -14,7 +14,9 @@ class OutputMessageSpec extends Specification {
 			input.with {
 				property = $(consumer(regex("[0-9]{5}")))
 			}
+			def value = Integer.valueOf(property.serverValue as String)
 		then:
-			(property.serverValue as String).matches(/[0-9]{5}/)
+			value >= 0
+			value <= 99_999
 	}
 }
diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RequestSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RequestSpec.groovy
index caf7522f62..1197ed1064 100644
--- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RequestSpec.groovy
+++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RequestSpec.groovy
@@ -31,7 +31,9 @@ class RequestSpec extends Specification {
 			request.with {
 				property = value(consumer(regex("[0-9]{5}")))
 			}
+			def value = Integer.valueOf(property.serverValue as String)
 		then:
-			(property.serverValue as String).matches(/[0-9]{5}/)
+			value >= 0
+			value <= 99_999
 	}
 }
diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ResponseSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ResponseSpec.groovy
index 1d19458c4e..e25aa95c03 100644
--- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ResponseSpec.groovy
+++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ResponseSpec.groovy
@@ -34,8 +34,10 @@ class ResponseSpec extends Specification {
 			request.with {
 				property = value(producer(regex("[0-9]{5}")))
 			}
+			def value = Integer.valueOf(property.clientValue as String)
 		then:
-			(property.clientValue as String).matches(/[0-9]{5}/)
+			value >= 0
+			value <= 99_999
 			(property.serverValue as Pattern).pattern() == '[0-9]{5}'
 	}
 }