diff --git a/e2e/renderer/e2e/config/appium.capabilities.json b/e2e/config/appium.capabilities.json
similarity index 72%
rename from e2e/renderer/e2e/config/appium.capabilities.json
rename to e2e/config/appium.capabilities.json
index f71c9d775..822dd9d0b 100644
--- a/e2e/renderer/e2e/config/appium.capabilities.json
+++ b/e2e/config/appium.capabilities.json
@@ -1,4 +1,15 @@
 {
+    "travis-e2e-tests": {
+        "platformName": "Android",
+        "platformVersion": "4.4",
+        "deviceName": "test",
+        "lt": 60000,
+        "appActivity": "com.tns.NativeScriptActivity",
+        "newCommandTimeout": 720,
+        "noReset": true,
+        "fullReset": false,
+        "app": ""
+    },
     "nexus5": {
         "browserName": "",
         "platformName": "Android",
@@ -81,6 +92,18 @@
         "fullReset": false,
         "app": ""
     },
+    "android27": {
+        "platformName": "Android",
+        "platformVersion": "27",
+        "deviceName": "Emulator-Api27-Google",
+        "avd": "Emulator-Api27-Google",
+        "lt": 60000,
+        "appActivity": "com.tns.NativeScriptActivity",
+        "newCommandTimeout": 720,
+        "noReset": true,
+        "fullReset": false,
+        "app": ""
+    },
     "sim.iPhone7.iOS100": {
         "platformName": "iOS",
         "platformVersion": "10.0",
@@ -96,5 +119,21 @@
         "noReset": true,
         "fullReset": false,
         "app": ""
+    },
+    "sim.iPhone8.iOS112": {
+        "platformName": "iOS",
+        "platformVersion": "11.2",
+        "deviceName": "iPhone 8 112",
+        "noReset": true,
+        "fullReset": false,
+        "app": ""
+    },
+    "sim.iPhoneX.iOS110": {
+        "platformName": "iOS",
+        "platformVersion": "11.2",
+        "deviceName": "iPhone X 110",
+        "noReset": true,
+        "fullReset": false,
+        "app": ""
     }
 }
diff --git a/e2e/renderer/e2e/config/mocha.opts b/e2e/config/mocha.opts
similarity index 100%
rename from e2e/renderer/e2e/config/mocha.opts
rename to e2e/config/mocha.opts
diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json
index f46089723..d74772799 100644
--- a/e2e/renderer/package.json
+++ b/e2e/renderer/package.json
@@ -58,7 +58,7 @@
     "webpack-sources": "~1.1.0"
   },
   "scripts": {
-    "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
+    "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
     "compile-tests-w": "tsc -p e2e --watch",
     "update-app-ng-deps": "update-app-ng-deps"
   }
diff --git a/e2e/router/e2e/config/appium.capabilities.json b/e2e/router/e2e/config/appium.capabilities.json
deleted file mode 100644
index f71c9d775..000000000
--- a/e2e/router/e2e/config/appium.capabilities.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "nexus5": {
-        "browserName": "",
-        "platformName": "Android",
-        "platformVersion": "6.0",
-        "deviceName": "device",
-        "udid": "077e4a47003b7698",
-        "appActivity": "com.tns.NativeScriptActivity",
-        "app": ""
-    },
-    "android19": {
-        "platformName": "Android",
-        "platformVersion": "4.4",
-        "deviceName": "Emulator-Api19-Default",
-        "avd": "Emulator-Api19-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": false,
-        "fullReset": false,
-        "app": ""
-    },
-    "android21": {
-        "platformName": "Android",
-        "platformVersion": "5.0",
-        "deviceName": "Emulator-Api21-Default",
-        "avd": "Emulator-Api21-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": false,
-        "fullReset": false,
-        "app": ""
-    },
-    "android23": {
-        "platformName": "Android",
-        "platformVersion": "6.0",
-        "deviceName": "Emulator-Api23-Default",
-        "avd": "Emulator-Api23-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": false,
-        "fullReset": false,
-        "app": ""
-    },
-    "android24": {
-        "platformName": "Android",
-        "platformVersion": "7.0",
-        "deviceName": "Emulator-Api24-Default",
-        "avd": "Emulator-Api24-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": false,
-        "fullReset": false,
-        "app": ""
-    },
-    "android25": {
-        "platformName": "Android",
-        "platformVersion": "7.1",
-        "deviceName": "Emulator-Api25-Google",
-        "avd": "Emulator-Api25-Google",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": false,
-        "fullReset": false,
-        "app": ""
-    },
-    "android26": {
-        "platformName": "Android",
-        "platformVersion": "8.0",
-        "deviceName": "Emulator-Api26-Google",
-        "avd": "Emulator-Api26-Google",
-        "lt": 60000,
-        "automationName": "UIAutomator2",
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": false,
-        "fullReset": false,
-        "app": ""
-    },
-    "sim.iPhone7.iOS100": {
-        "platformName": "iOS",
-        "platformVersion": "10.0",
-        "deviceName": "iPhone 7 100",
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "sim.iPhone7.iOS110": {
-        "platformName": "iOS",
-        "platformVersion": "11.2",
-        "deviceName": "iPhone 7 110",
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    }
-}
diff --git a/e2e/router/e2e/config/mocha.opts b/e2e/router/e2e/config/mocha.opts
deleted file mode 100644
index 796ec4724..000000000
--- a/e2e/router/e2e/config/mocha.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---timeout 80000
---recursive e2e
---reporter mocha-multi 
---reporter-options spec=-,mocha-junit-reporter=test-results.xml
\ No newline at end of file
diff --git a/e2e/router/package.json b/e2e/router/package.json
index 3a7baf60b..8e2bfc4ad 100644
--- a/e2e/router/package.json
+++ b/e2e/router/package.json
@@ -62,7 +62,7 @@
     "webpack-sources": "~1.1.0"
   },
   "scripts": {
-    "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
+    "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
     "compile-tests-w": "tsc -p e2e --watch",
     "update-app-ng-deps": "update-app-ng-deps"
   }
diff --git a/tests/e2e/config/appium.capabilities.json b/tests/e2e/config/appium.capabilities.json
deleted file mode 100644
index ee7f5a177..000000000
--- a/tests/e2e/config/appium.capabilities.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "travis-e2e-tests": {
-        "platformName": "Android",
-        "platformVersion": "4.4",
-        "deviceName": "test",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "android19": {
-        "platformName": "Android",
-        "platformVersion": "4.4",
-        "deviceName": "Emulator-Api19-Default",
-        "avd": "Emulator-Api19-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "android21": {
-        "platformName": "Android",
-        "platformVersion": "5.0",
-        "deviceName": "Emulator-Api21-Default",
-        "avd": "Emulator-Api21-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "android23": {
-        "platformName": "Android",
-        "platformVersion": "6.0",
-        "deviceName": "Emulator-Api23-Default",
-        "avd": "Emulator-Api23-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "android24": {
-        "platformName": "Android",
-        "platformVersion": "7.0",
-        "deviceName": "Emulator-Api24-Default",
-        "avd": "Emulator-Api24-Default",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "android25": {
-        "platformName": "Android",
-        "platformVersion": "7.1",
-        "deviceName": "Emulator-Api25-Google",
-        "avd": "Emulator-Api25-Google",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "android26": {
-        "platformName": "Android",
-        "platformVersion": "8.0",
-        "deviceName": "Emulator-Api26-Google",
-        "avd": "Emulator-Api26-Google",
-        "lt": 60000,
-        "appActivity": "com.tns.NativeScriptActivity",
-        "newCommandTimeout": 720,
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "sim.iPhone7.iOS100": {
-        "platformName": "iOS",
-        "platformVersion": "10.0",
-        "deviceName": "iPhone 7 100",
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    },
-    "sim.iPhone7.iOS110": {
-        "platformName": "iOS",
-        "platformVersion": "11.0",
-        "deviceName": "iPhone 7 110",
-        "noReset": true,
-        "fullReset": false,
-        "app": ""
-    }
-}
diff --git a/tests/e2e/config/mocha.opts b/tests/e2e/config/mocha.opts
deleted file mode 100644
index ea635b0dc..000000000
--- a/tests/e2e/config/mocha.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---timeout 140000
---recursive e2e
---reporter mocha-multi 
---reporter-options spec=-,mocha-junit-reporter=test-results.xml
\ No newline at end of file
diff --git a/tests/package.json b/tests/package.json
index e3b3cf922..eb9f9b460 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -70,7 +70,7 @@
     "mocha": "~3.5.0"
   },
   "scripts": {
-    "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
+    "e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json",
     "compile-tests-w": "tsc -p e2e --watch",
     "update-app-ng-deps": "update-app-ng-deps"
   }