diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy
index 51cabcbade..bcec159597 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMethodBodyBuilder.groovy
@@ -3,6 +3,7 @@ package io.codearte.accurest.builder
 import groovy.json.StringEscapeUtils
 import groovy.transform.PackageScope
 import groovy.transform.TypeChecked
+import io.codearte.accurest.config.TestFramework
 import io.codearte.accurest.dsl.GroovyDsl
 import io.codearte.accurest.dsl.internal.ExecutionProperty
 import io.codearte.accurest.dsl.internal.Header
@@ -10,6 +11,7 @@ import io.codearte.accurest.dsl.internal.NamedProperty
 import io.codearte.accurest.dsl.internal.Request
 
 import static groovy.json.StringEscapeUtils.escapeJava
+import static io.codearte.accurest.config.TestFramework.JUNIT
 import static io.codearte.accurest.util.ContentUtils.getJavaMultipartFileParameterContent
 
 /**
@@ -36,7 +38,7 @@ abstract class JUnitMethodBodyBuilder extends MethodBodyBuilder {
 
 	@Override
 	protected BlockBuilder addColonIfRequired(BlockBuilder blockBuilder) {
-		blockBuilder.addAtTheEnd(';')
+		blockBuilder.addAtTheEnd(JUNIT.lineSuffix)
 		return blockBuilder
 	}
 
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/builder/JaxRsClientJUnitMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JaxRsClientJUnitMethodBodyBuilder.groovy
index 79180caf54..67827a70b9 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/builder/JaxRsClientJUnitMethodBodyBuilder.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JaxRsClientJUnitMethodBodyBuilder.groovy
@@ -1,10 +1,13 @@
 package io.codearte.accurest.builder
 
+import io.codearte.accurest.config.TestFramework
 import io.codearte.accurest.dsl.GroovyDsl
 import io.codearte.accurest.dsl.internal.Header
 import io.codearte.accurest.dsl.internal.QueryParameter
 import io.codearte.accurest.dsl.internal.QueryParameters
 
+import static io.codearte.accurest.config.TestFramework.JUNIT
+
 /**
  * @author Olga Maciaszek-Sharma 
  @since 21.02.16
@@ -31,7 +34,7 @@ class JaxRsClientJUnitMethodBodyBuilder extends JUnitMethodBodyBuilder {
 		appendRequestWithRequiredResponseContentType(bb)
 		appendHeaders(bb)
 		appendMethodAndBody(bb)
-		bb.addAtTheEnd(';')
+		bb.addAtTheEnd(JUNIT.lineSuffix)
 
 		bb.unindent()