diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy
index 1eb49b73d0..f79afe361f 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy
@@ -81,6 +81,8 @@ abstract class MessagingMethodBodyBuilder extends MethodBodyBuilder {
 				bb.endBlock()
 				if (outputMessage.headers) {
 					bb.addLine(addCommentSignIfRequired('and:')).startBlock()
+				} else {
+					bb.startBlock()
 				}
 				validateResponseBodyBlock(bb, outputMessage.matchers, outputMessage.body.serverValue)
 			}
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy
index 4346f36bd8..278131ff2a 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy
@@ -343,6 +343,9 @@ then:
  assertThatJson(parsedJson).field("bookName").isEqualTo("foo");
 '''
 			stripped(test) == stripped(expectedMsg)
+		and: 'indents are maintained'
+			test.contains("  ContractVerifierMessage response")
+			test.contains("  DocumentContext parsedJson")
 	}
 
 	def "should generate tests without headers for Spock"() {