diff --git a/apps/package.json b/apps/package.json
index a5186477d..e4a1d524a 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -6,7 +6,7 @@
   "nativescript": {
     "id": "org.nativescript.apps",
     "tns-ios": {
-      "version": "2.4.0"
+      "version": "2.5.0"
     },
     "tns-android": {
       "version": "2.4.1"
@@ -22,6 +22,6 @@
     "babylon": "6.8.3",
     "lazy": "1.0.11",
     "nativescript-dev-typescript": "^0.3.0",
-    "typescript": "~2.0.10"
+    "typescript": "~2.1.6"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/tsconfig.json b/apps/tsconfig.json
index a217a060d..c06a3a67e 100644
--- a/apps/tsconfig.json
+++ b/apps/tsconfig.json
@@ -1,16 +1,5 @@
 {
-    "compilerOptions": {
-        "noEmitOnError": true,
-        "noEmitHelpers": true,
-        "target": "es5",
-        "module": "commonjs",
-        "declaration": false,
-        "noImplicitAny": false,
-        "noImplicitUseStrict": true,
-        "experimentalDecorators": true,
-        "diagnostics": true,
-        "sourceMap": true
-    },
+    "extends": "../tsconfig.shared",
     "exclude": [
         "node_modules",
         "platforms"
diff --git a/tests/package.json b/tests/package.json
index 9a250763b..c53305030 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -22,6 +22,6 @@
     "babylon": "6.8.0",
     "filewalker": "0.1.2",
     "lazy": "1.0.11",
-    "typescript": "~2.0.10"
+    "typescript": "~2.1.6"
   }
 }
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index 39310fe14..c06a3a67e 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -1,19 +1,5 @@
 {
-    "compilerOptions": {
-        "noEmitOnError": true,
-        "noEmitHelpers": true,
-        "target": "es5",
-        "module": "commonjs",
-        "declaration": false,
-        "noImplicitAny": false,
-        "noImplicitUseStrict": true,
-        "experimentalDecorators": true,
-        "diagnostics": true,
-        "sourceMap": true,
-        "noLib": true,
-        "jsx": "react",
-        "reactNamespace": "UIBuilder"
-    },
+    "extends": "../tsconfig.shared",
     "exclude": [
         "node_modules",
         "platforms"