diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
index 8c6c7149f9b..fdcf69690fa 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
@@ -56,6 +56,8 @@ public class JaxRSServerOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setSupportJava6(false);
             times = 1;
+            clientCodegen.setUseBeanValidation(Boolean.valueOf(JaxRSServerOptionsProvider.USE_BEANVALIDATION));
+            times = 1;
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
index 57896db9ca6..d76165e61e7 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
@@ -2,6 +2,7 @@ package io.swagger.codegen.options;
 
 import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.JavaCXFServerCodegen;
 import io.swagger.codegen.languages.JavaClientCodegen;
 
 import java.util.Map;
@@ -25,6 +26,8 @@ public class JaxRSServerOptionsProvider implements OptionsProvider {
     public static final String JODA_DATE_LIBRARY = "joda";
     public static final String IMPL_FOLDER_VALUE = "src/main/java/impl";
     public static final String JAXRS_DEFAULT_LIBRARY_VALUE = "jersey1";
+    public static final String USE_BEANVALIDATION = "true";
+    
 
     @Override
     public boolean isServer() {
@@ -60,7 +63,8 @@ public class JaxRSServerOptionsProvider implements OptionsProvider {
             .put(CodegenConstants.LIBRARY, JAXRS_DEFAULT_LIBRARY_VALUE)
             .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true")
             //.put(JavaClientCodegen.DATE_LIBRARY, "joda")
-            .put("hideGenerationTimestamp", "true");
+            .put("hideGenerationTimestamp", "true")
+            .put(JavaCXFServerCodegen.USE_BEANVALIDATION, USE_BEANVALIDATION);
 
         return builder.build();
     }