diff --git a/config/nightwatch.json b/config/nightwatch.json
index 0f845e3e..f8da926d 100644
--- a/config/nightwatch.json
+++ b/config/nightwatch.json
@@ -122,28 +122,11 @@
         "platform": "OS X 10.9"
       }
     },
-    "iphone8_1": {
+    "iphone6_plus": {
       "desiredCapabilities": {
-        "platform": "OS X 10.10",
-        "version": "8.1",
-        "deviceName": "iPhone Simulator",
-        "device-orientation": "portrait"
-      }
-    },
-    "iphone7": {
-      "desiredCapabilities": {
-        "platform": "OS X 10.10",
-        "version": "7.0",
-        "deviceName": "iPhone Simulator",
-        "device-orientation": "portrait"
-      }
-    },
-    "ipad8_0": {
-      "desiredCapabilities": {
-        "platform": "OS X 10.10",
-        "version": "8.0",
-        "deviceName": "iPad Simulator",
-        "device-orientation": "portrait"
+        "version": "8.3",
+        "deviceName": "iPhone 6 Plus",
+        "deviceOrientation": "portrait"
       }
     },
     "Android_Nexus7HD": {
diff --git a/tasks/nightwatch.js b/tasks/nightwatch.js
index 9dcf850a..c6b2d1b7 100644
--- a/tasks/nightwatch.js
+++ b/tasks/nightwatch.js
@@ -13,7 +13,7 @@ function toStdErr(data) {
 
 module.exports = function(opts) {
 	var test = opts.test;
-	var env = opts.env || 'ie9,ie10,ie11,firefox38,firefox39,chrome42,chrome43,iphone7,Android_Nexus7HD';
+	var env = opts.env || 'ie9,ie10,ie11,firefox38,firefox39,chrome42,chrome43,iphone6_plus,Android_Nexus7HD';
 	var config = opts.config || path.join(__dirname, '..', 'config', 'nightwatch.json');
 	var args = [ '--env', env, '--test', test, '--config', config ];