diff --git a/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache
index 5ba893a45428..bcfb59dbfdbe 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache
@@ -6,7 +6,7 @@
 * @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
 * @version {{projectVersion}}
 */{{/emitJSDoc}}
-export default class {{classname}} {
+export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}extends Array {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{
     {{#emitJSDoc}}/**
     * Constructs a new <code>{{classname}}</code>.{{#description}}
     * {{description}}{{/description}}
@@ -19,8 +19,8 @@ export default class {{classname}} {
 
     constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
         {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
-        this = new Array();
-        Object.setPrototypeOf(this, {{classname}});{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
+        super();
+        {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
 
         {{#useInheritance}}
         {{#parentModel}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md
index 159eabe7058d..b4e9dc0f612c 100644
--- a/samples/client/petstore/javascript-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md
@@ -268,7 +268,7 @@ let _double = 1.2; // Number | None
 
 let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-let _byte = B; // Blob | None
+let _byte = _byte_example; // Blob | None
 
 let opts = { 
   'integer': 56, // Number | None
diff --git a/samples/client/petstore/javascript-es6/pom.xml b/samples/client/petstore/javascript-es6/pom.xml
deleted file mode 100644
index 79000bf98b5a..000000000000
--- a/samples/client/petstore/javascript-es6/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
-    <artifactId>swagger-petstore-javascript-es6</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Swagger Petstore JS ES6 Client</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>npm-install</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>npm</executable>
-                            <arguments>
-                                <argument>install</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>mocha</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>npm</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js b/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
index 8dc9f00cadbf..eb9a14b1b44f 100644
--- a/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
@@ -24,7 +24,7 @@ import Animal from './Animal';
 * @module model/AnimalFarm
 * @version 1.0.0
 */
-export default class AnimalFarm {
+export default class AnimalFarm extends Array {
     /**
     * Constructs a new <code>AnimalFarm</code>.
     * @alias module:model/AnimalFarm
@@ -34,8 +34,8 @@ export default class AnimalFarm {
 
     constructor() {
         
-        this = new Array();
-        Object.setPrototypeOf(this, AnimalFarm);
+        super();
+        
 
         
         
diff --git a/samples/client/petstore/javascript-es6/test/api/FakeApi.spec.js b/samples/client/petstore/javascript-es6/test/api/FakeApi.spec.js
index a4c9cc1f7b30..f2903d6612ca 100644
--- a/samples/client/petstore/javascript-es6/test/api/FakeApi.spec.js
+++ b/samples/client/petstore/javascript-es6/test/api/FakeApi.spec.js
@@ -48,6 +48,46 @@
   }
 
   describe('FakeApi', function() {
+    describe('fakeOuterBooleanSerialize', function() {
+      it('should call fakeOuterBooleanSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterBooleanSerialize
+        //instance.fakeOuterBooleanSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterCompositeSerialize', function() {
+      it('should call fakeOuterCompositeSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterCompositeSerialize
+        //instance.fakeOuterCompositeSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterNumberSerialize', function() {
+      it('should call fakeOuterNumberSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterNumberSerialize
+        //instance.fakeOuterNumberSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterStringSerialize', function() {
+      it('should call fakeOuterStringSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterStringSerialize
+        //instance.fakeOuterStringSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
     describe('testClientModel', function() {
       it('should call testClientModel successfully', function(done) {
         //uncomment below and update the code to test testClientModel
diff --git a/samples/client/petstore/javascript-es6/test/model/OuterBoolean.spec.js b/samples/client/petstore/javascript-es6/test/model/OuterBoolean.spec.js
index 7560cff154b4..d5495a638d81 100644
--- a/samples/client/petstore/javascript-es6/test/model/OuterBoolean.spec.js
+++ b/samples/client/petstore/javascript-es6/test/model/OuterBoolean.spec.js
@@ -7,9 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
diff --git a/samples/client/petstore/javascript-es6/test/model/OuterComposite.spec.js b/samples/client/petstore/javascript-es6/test/model/OuterComposite.spec.js
index 819eebef7ec0..6fd830b7c0e2 100644
--- a/samples/client/petstore/javascript-es6/test/model/OuterComposite.spec.js
+++ b/samples/client/petstore/javascript-es6/test/model/OuterComposite.spec.js
@@ -7,9 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
diff --git a/samples/client/petstore/javascript-es6/test/model/OuterNumber.spec.js b/samples/client/petstore/javascript-es6/test/model/OuterNumber.spec.js
index 4dbe9d889bb3..7b0e4ebf1193 100644
--- a/samples/client/petstore/javascript-es6/test/model/OuterNumber.spec.js
+++ b/samples/client/petstore/javascript-es6/test/model/OuterNumber.spec.js
@@ -7,9 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
diff --git a/samples/client/petstore/javascript-es6/test/model/OuterString.spec.js b/samples/client/petstore/javascript-es6/test/model/OuterString.spec.js
index d0f6a8fbd9d1..4e7f99ca88d1 100644
--- a/samples/client/petstore/javascript-es6/test/model/OuterString.spec.js
+++ b/samples/client/petstore/javascript-es6/test/model/OuterString.spec.js
@@ -7,9 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
index d26ee4e74bf2..27afbd414a52 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
@@ -258,7 +258,7 @@ let _double = 1.2; // Number | None
 
 let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-let _byte = B; // Blob | None
+let _byte = _byte_example; // Blob | None
 
 let opts = { 
   'integer': 56, // Number | None
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js b/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js
index 8dc9f00cadbf..eb9a14b1b44f 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js
@@ -24,7 +24,7 @@ import Animal from './Animal';
 * @module model/AnimalFarm
 * @version 1.0.0
 */
-export default class AnimalFarm {
+export default class AnimalFarm extends Array {
     /**
     * Constructs a new <code>AnimalFarm</code>.
     * @alias module:model/AnimalFarm
@@ -34,8 +34,8 @@ export default class AnimalFarm {
 
     constructor() {
         
-        this = new Array();
-        Object.setPrototypeOf(this, AnimalFarm);
+        super();
+        
 
         
         
diff --git a/samples/client/petstore/javascript-promise/docs/FakeApi.md b/samples/client/petstore/javascript-promise/docs/FakeApi.md
index 7bfea4df8890..2af66d48cb45 100644
--- a/samples/client/petstore/javascript-promise/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise/docs/FakeApi.md
@@ -258,7 +258,7 @@ var _double = 1.2; // Number | None
 
 var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = B; // Blob | None
+var _byte = _byte_example; // Blob | None
 
 var opts = { 
   'integer': 56, // Number | None
diff --git a/samples/client/petstore/javascript/docs/FakeApi.md b/samples/client/petstore/javascript/docs/FakeApi.md
index 85ac0b3d8a20..ca6c497881c5 100644
--- a/samples/client/petstore/javascript/docs/FakeApi.md
+++ b/samples/client/petstore/javascript/docs/FakeApi.md
@@ -273,7 +273,7 @@ var _double = 1.2; // Number | None
 
 var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = B; // Blob | None
+var _byte = _byte_example; // Blob | None
 
 var opts = { 
   'integer': 56, // Number | None