diff --git a/test/functional/ios/safari/screenshot-specs.js b/test/functional/ios/safari/screenshot-specs.js
index 794d8f0f5..5b8a53d8d 100644
--- a/test/functional/ios/safari/screenshot-specs.js
+++ b/test/functional/ios/safari/screenshot-specs.js
@@ -1,33 +1,29 @@
 "use strict";
 
-var env = require('../../../helpers/env')
-  , setup = require("../../common/setup-base");
+var setup = require("../../common/setup-base");
 
-describe("safari - screenshot", function () {
-  // TODO: enable safari tests on ci
-  describe('screenshots (' + env.DEVICE + ')', function () {
-    var driver;
-    setup(this, {browserName: 'safari'}).then(function (d) { driver = d; });
+describe('safari - screenshots', function () {
+  var driver;
+  setup(this, {browserName: 'safari'}).then(function (d) { driver = d; });
 
-    it('should get an app screenshot', function (done) {
-      driver
-        .takeScreenshot()
-          .should.eventually.exist
-        .nodeify(done);
-    });
-    it('should get an app screenshot in landscape mode', function (done) {
-      driver.takeScreenshot().then(function (screenshot1) {
-        screenshot1.should.exist;
-        return driver
-          .setOrientation("LANDSCAPE")
-          // A useless error does often exist here, let's ignore it
-          .catch(function () {})
-          .takeScreenshot().then(function (screenshot2) {
-            screenshot2.should.exist;
-            screenshot2.should.not.eql(screenshot1);
-          });
-      }).sleep(3000) // cooldown
+  it('should get an app screenshot', function (done) {
+    driver
+      .takeScreenshot()
+        .should.eventually.exist
       .nodeify(done);
-    });
+  });
+  it('should get an app screenshot in landscape mode', function (done) {
+    driver.takeScreenshot().then(function (screenshot1) {
+      screenshot1.should.exist;
+      return driver
+        .setOrientation("LANDSCAPE")
+        // A useless error does often exist here, let's ignore it
+        .catch(function () {})
+        .takeScreenshot().then(function (screenshot2) {
+          screenshot2.should.exist;
+          screenshot2.should.not.eql(screenshot1);
+        });
+    }).sleep(3000) // cooldown
+    .nodeify(done);
   });
 });
diff --git a/test/functional/ios/webview/webview-specs.js b/test/functional/ios/webview/basics-specs.js
similarity index 98%
rename from test/functional/ios/webview/webview-specs.js
rename to test/functional/ios/webview/basics-specs.js
index 68c24f491..7194c1706 100644
--- a/test/functional/ios/webview/webview-specs.js
+++ b/test/functional/ios/webview/basics-specs.js
@@ -4,7 +4,7 @@ var setup = require("../../common/setup-base")
   , desired = require('./desired')
   , _ = require('underscore');
 
-describe('webview', function () {
+describe('webview - basics', function () {
 
   var driver;
 
diff --git a/test/helpers/env.js b/test/helpers/env.js
index 3381e8a24..f63e719cf 100644
--- a/test/helpers/env.js
+++ b/test/helpers/env.js
@@ -132,17 +132,6 @@ env.ANDROID = env.DEVICE.match(/android/i);
 env.LAUNCH_TIMEOUT =  process.env.LAUNCH_TIMEOUT ? JSON.parse(process.env.LAUNCH_TIMEOUT) :
   (env.IOS71 ? {"global": 60000, "afterSimLaunch": 10000} : 60000);
 
-// caps overide for sauce
-if (env.SAUCE) {
-  if (env.DEVICE === 'IOS') {
-    env.CAPS.version = "6.1";
-    env.CAPS.platform = "Mac 10.8";
-  } else if (env.CAPS.device === 'Android') {
-    env.CAPS.version = "4.2";
-    env.CAPS.platform = "LINUX";
-  }
-}
-
 env.CAPS.launchTimeout = env.LAUNCH_TIMEOUT;
 
 if (env.IOS) {
@@ -174,6 +163,7 @@ if (env.SAUCE && env.TARBALL) {
     'appium-startup-args': 'minimal'
     //'appium-startup-args': '-m'
   };
+  env.CAPS.tags=[env.DEVICE];
 }
 
 // rest enf points