diff --git a/spec/basic/elements_spec.js b/spec/basic/elements_spec.js
index eab44202f..b9acc2fd8 100644
--- a/spec/basic/elements_spec.js
+++ b/spec/basic/elements_spec.js
@@ -463,7 +463,7 @@ describe('ElementArrayFinder', function() {
     ]);
   });
 
-  fit('should map and resolve multiple promises', function() {
+  it('should map and resolve multiple promises', function() {
     browser.get('index.html#/form');
     var labels = element.all(by.css('#animals ul li')).map(function(elm) {
       return {
diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js
index 0dc945427..58e7b433d 100644
--- a/spec/ciFullConf.js
+++ b/spec/ciFullConf.js
@@ -24,8 +24,8 @@ exports.config = {
     'name': 'Protractor suite tests',
     'version': '54',
     'selenium-version': '2.53.1',
-    'chromedriver-version': '2.25',
-    'platform': 'OS X 10.9'
+    'chromedriver-version': '2.26',
+    'platform': 'OS X 10.11'
   }, {
     'browserName': 'firefox',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
diff --git a/spec/ciNg2Conf.js b/spec/ciNg2Conf.js
index 2235dfaa2..9b6dac66f 100644
--- a/spec/ciNg2Conf.js
+++ b/spec/ciNg2Conf.js
@@ -12,8 +12,8 @@ exports.config.multiCapabilities = [{
     'name': 'Protractor suite tests',
     'version': '54',
     'selenium-version': '2.53.1',
-    'chromedriver-version': '2.25',
-    'platform': 'OS X 10.9'
+    'chromedriver-version': '2.26',
+    'platform': 'OS X 10.11'
   }];
 exports.config.capabilities = undefined;
 exports.config.allScriptsTimeout = 120000;
diff --git a/spec/ciSmokeConf.js b/spec/ciSmokeConf.js
index 51a9a23f0..bdabdd295 100644
--- a/spec/ciSmokeConf.js
+++ b/spec/ciSmokeConf.js
@@ -25,8 +25,8 @@ exports.config = {
     'name': 'Protractor smoke tests',
     'version': '54',
     'selenium-version': '2.53.1',
-    'chromedriver-version': '2.25',
-    'platform': 'OS X 10.9'
+    'chromedriver-version': '2.26',
+    'platform': 'OS X 10.11'
   }, {
     'browserName': 'firefox',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
@@ -35,14 +35,7 @@ exports.config = {
     'version': '47',
     'selenium-version': '2.53.1'
   }, {
-    'browserName': 'safari',
-    'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
-    'build': process.env.TRAVIS_BUILD_NUMBER,
-    'name': 'Protractor smoke tests',
-    'version': '8',
-    'selenium-version': '2.44.0' // Use an old version because Safari has
-                                 // issues loading pages after 2.44.
-  }, {
+    // TODO: Add Safari 10 once Saucelabs gets Selenium 3
     'browserName': 'safari',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
     'build': process.env.TRAVIS_BUILD_NUMBER,
@@ -51,21 +44,21 @@ exports.config = {
     'selenium-version': '2.44.0' // Use an old version because Safari has
                                  // issues loading pages after 2.44.
   }, {
-    'browserName': 'internet explorer',
+    'browserName': 'MicrosoftEdge',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
     'build': process.env.TRAVIS_BUILD_NUMBER,
     'name': 'Protractor smoke tests',
-    'version': '11',
+    'version': '14.14393',
     'selenium-version': '2.53.1',
-    'platform': 'Windows 7'
+    'platform': 'Windows 10'
   }, {
-    'browserName': 'internet explorer',
+    'browserName': 'Internet Explorer',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
     'build': process.env.TRAVIS_BUILD_NUMBER,
     'name': 'Protractor smoke tests',
-    'version': '10',
+    'version': '11',
     'selenium-version': '2.53.1',
-    'platform': 'Windows 7'
+    'platform': 'Windows 8.1'
   }],
 
   baseUrl: env.baseUrl + '/ng1/',