diff --git a/apps/references.d.ts b/apps/references.d.ts
index f803d2bdc..48830c121 100644
--- a/apps/references.d.ts
+++ b/apps/references.d.ts
@@ -1 +1,5 @@
-/// <reference path="../tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
\ No newline at end of file
+/// <reference path="../tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/android17.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/ios.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/org.nativescript.widgets.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/declarations.android.d.ts" /> Needed for autocompletion and compilation.
\ No newline at end of file
diff --git a/apps/tsconfig.json b/apps/tsconfig.json
index 0ec588987..d6e427e0e 100644
--- a/apps/tsconfig.json
+++ b/apps/tsconfig.json
@@ -1,12 +1,14 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "es5",
-        "sourceMap": true,
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
+        "noEmitOnError": true,
         "noEmitHelpers": true,
-        "noEmitOnError": true
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": true,
+        "noImplicitUseStrict": true,
+        "experimentalDecorators": true,
+        "diagnostics": true
     },
     "exclude": [
         "node_modules",
diff --git a/tests/package.json b/tests/package.json
index 7f48effc3..17ce53ae6 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -20,6 +20,7 @@
     "babel-types": "6.9.0",
     "babylon": "6.8.0",
     "filewalker": "0.1.2",
-    "lazy": "1.0.11"
+    "lazy": "1.0.11",
+    "typescript": "^1.8.10"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/references.d.ts b/tests/references.d.ts
index f803d2bdc..48830c121 100644
--- a/tests/references.d.ts
+++ b/tests/references.d.ts
@@ -1 +1,5 @@
-/// <reference path="../tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
\ No newline at end of file
+/// <reference path="../tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/android17.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/ios.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/org.nativescript.widgets.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="../tns-core-modules/declarations.android.d.ts" /> Needed for autocompletion and compilation.
\ No newline at end of file
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index 0ec588987..5d13c12c4 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -1,12 +1,14 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "es5",
-        "sourceMap": true,
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
+        "noEmitOnError": true,
         "noEmitHelpers": true,
-        "noEmitOnError": true
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": false,
+        "noImplicitUseStrict": true,
+        "experimentalDecorators": true,
+        "diagnostics": true
     },
     "exclude": [
         "node_modules",