diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
index 513786e4609..90f0168db54 100644
--- a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
@@ -265,4 +265,30 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).required should equal (true)
     vars.get(0).isNotContainer should equal (true)
   }
+
+  it should "convert a model with a 2nd char upper-case property names" in {
+    val model = new ModelImpl()
+      .description("a model with a 2nd char upper-case property names")
+      .property("pId", new StringProperty())
+      .required("pId")
+
+    val codegen = new JavaClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be ("sample")
+    cm.classname should be ("Sample")
+    cm.vars.size should be (1)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be ("pId")
+    vars.get(0).getter should be ("getpId")
+    vars.get(0).setter should be ("setpId")
+    vars.get(0).datatype should be ("String")
+    vars.get(0).name should be ("pId")
+    vars.get(0).defaultValue should be ("null")
+    vars.get(0).baseType should be ("String")
+    vars.get(0).hasMore should equal (null)
+    vars.get(0).required should equal (true)
+    vars.get(0).isNotContainer should equal (true)
+  }
 }