diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
index 547200a6695..28a18bfb91b 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
@@ -16,15 +16,8 @@
     "build": "typings install && tsc"
   },
   "peerDependencies": {
-    "@angular/common": "^2.0.0-rc.1",
-    "@angular/compiler": "^2.0.0-rc.1",
     "@angular/core": "^2.0.0-rc.1",
-    "@angular/http": "^2.0.0-rc.1",
-    "@angular/platform-browser": "^2.0.0-rc.1",
-    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
-    "core-js": "^2.3.0",
-    "rxjs": "^5.0.0-beta.6",
-    "zone.js": "^0.6.12"
+    "@angular/http": "^2.0.0-rc.1"
   },
   "devDependencies": {
     "@angular/common": "^2.0.0-rc.1",
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
index faf5c3551ca..fa4d2e9da53 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
@@ -6,11 +6,11 @@ import org.testng.reporters.Files;
 import java.io.IOException;
 import java.util.Map;
 
-import io.swagger.codegen.utils.IntegrationTestPathsConfig;
+import io.swagger.codegen.testutils.IntegrationTestPathsConfig;
 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
 
-import static io.swagger.codegen.utils.AssertFile.assertPathEqualsRecursively;
+import static io.swagger.codegen.testutils.AssertFile.assertPathEqualsRecursively;
 
 public abstract class AbstractIntegrationTest {
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/utils/AssertFile.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/testutils/AssertFile.java
similarity index 99%
rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/utils/AssertFile.java
rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/testutils/AssertFile.java
index d08b53bd686..f810e20eb0a 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/utils/AssertFile.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/testutils/AssertFile.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.utils;
+package io.swagger.codegen.testutils;
 
 import org.testng.Assert;
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/utils/IntegrationTestPathsConfig.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/testutils/IntegrationTestPathsConfig.java
similarity index 96%
rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/utils/IntegrationTestPathsConfig.java
rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/testutils/IntegrationTestPathsConfig.java
index 25aca976e61..4335c69dd2d 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/utils/IntegrationTestPathsConfig.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/testutils/IntegrationTestPathsConfig.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.utils;
+package io.swagger.codegen.testutils;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2AdditionalPropertiesIntegrationTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2AdditionalPropertiesIntegrationTest.java
index 8cc7f25c023..8b23105f28c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2AdditionalPropertiesIntegrationTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2AdditionalPropertiesIntegrationTest.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import io.swagger.codegen.AbstractIntegrationTest;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen;
-import io.swagger.codegen.utils.IntegrationTestPathsConfig;
+import io.swagger.codegen.testutils.IntegrationTestPathsConfig;
 
 public class TypescriptAngular2AdditionalPropertiesIntegrationTest extends AbstractIntegrationTest {