diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
index 25e152a9e344..a85c170082e8 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
@@ -1,7 +1,8 @@
 import request = require('request');
-import promise = require('bluebird');
 import http = require('http');
 
+let defaultBasePath = '{{basePath}}';
+
 // ===============================================
 // This file is autogenerated - Please do not edit
 // ===============================================
@@ -22,7 +23,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
     * {{{description}}}
     */
 {{/description}}
-    "{{name}}": {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    '{{name}}': {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
 }
 
@@ -31,7 +32,7 @@ export namespace {{classname}} {
 {{#vars}}
 {{#isEnum}}
     export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-        {{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
+        {{datatypeWithEnum}}_{{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
     }
 {{/isEnum}}
 {{/vars}}
@@ -105,7 +106,7 @@ export enum {{classname}}ApiKeys {
 }
 
 export class {{classname}} {
-    protected basePath = '{{basePath}}';
+    protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
 
     protected authentications = {
@@ -182,7 +183,7 @@ export class {{classname}} {
      * {{notes}}
      {{#allParams}}* @param {{paramName}} {{description}}
      {{/allParams}}*/
-    public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> {
+    public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.IncomingMessage; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }> {
         const localVarPath = this.basePath + '{{path}}'{{#pathParams}}
             .replace('{' + '{{baseName}}' + '}', String({{paramName}})){{/pathParams}};
         let queryParameters: any = {};
@@ -216,8 +217,6 @@ export class {{classname}} {
 {{/isFile}}
 
 {{/formParams}}
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>();
-
         let requestOptions: request.Options = {
             method: '{{httpMethod}}',
             qs: queryParameters,
@@ -227,7 +226,7 @@ export class {{classname}} {
 {{#bodyParam}}
             body: {{paramName}},
 {{/bodyParam}}
-        }
+        };
 
 {{#authMethods}}
         this.authentications.{{name}}.applyToRequest(requestOptions);
@@ -242,20 +241,21 @@ export class {{classname}} {
                 requestOptions.form = formParams;
             }
         }
-
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        
+        return new Promise<{ response: http.IncomingMessage; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
 
-        return localVarDeferred.promise;
     }
 {{/operation}}
 }
diff --git a/samples/client/petstore/typescript-angular/package.json b/samples/client/petstore/typescript-angular/package.json
index f50b782c09f2..0819b27f295c 100644
--- a/samples/client/petstore/typescript-angular/package.json
+++ b/samples/client/petstore/typescript-angular/package.json
@@ -5,12 +5,13 @@
   "main": "api.js",
   "scripts": {
     "postinstall": "tsd reinstall --overwrite",
-    "test": "tsc",
+    "test": "tsc --target ES6 && node client.js",
     "clean": "rm -Rf node_modules/ typings/ *.js"
   },
   "author": "Mads M. Tandrup",
   "license": "Apache 2.0",
   "dependencies": {
+    "request": "^2.60.0",
     "angular": "^1.4.3"
   },
   "devDependencies": {
diff --git a/samples/client/petstore/typescript-angular/tsd.json b/samples/client/petstore/typescript-angular/tsd.json
index 182b9f68fa2a..c4cfa3f1bacd 100644
--- a/samples/client/petstore/typescript-angular/tsd.json
+++ b/samples/client/petstore/typescript-angular/tsd.json
@@ -5,11 +5,20 @@
   "path": "typings",
   "bundle": "typings/tsd.d.ts",
   "installed": {
-    "angularjs/angular.d.ts": {
+  	"angularjs/angular.d.ts": {
       "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
     },
     "jquery/jquery.d.ts": {
       "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "request/request.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "form-data/form-data.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "node/node.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
     }
   }
 }