diff --git a/nailgun/gulpfile.js b/nailgun/gulpfile.js
index eaff6c82a1..cc61d907ae 100644
--- a/nailgun/gulpfile.js
+++ b/nailgun/gulpfile.js
@@ -55,7 +55,7 @@ function shutdownSelenium() {
   }
 }
 
-var SELENIUM_VERSION = '2.45.0';
+var SELENIUM_VERSION = '2.52.0';
 var SELENIUM_DRIVERS = {chrome: {version: '2.20'}};
 
 gulp.task('selenium:fetch', function(cb) {
diff --git a/nailgun/static/tests/functional/pages/clusters.js b/nailgun/static/tests/functional/pages/clusters.js
index a3d614b774..f2b9e614bd 100644
--- a/nailgun/static/tests/functional/pages/clusters.js
+++ b/nailgun/static/tests/functional/pages/clusters.js
@@ -63,6 +63,7 @@ define([
     goToEnvironment: function(clusterName) {
       var self = this;
       return this.remote
+        .waitForCssSelector(self.clusterSelector, 5000)
         .findAllByCssSelector(self.clusterSelector)
         .then(function(divs) {
           return divs.reduce(
diff --git a/nailgun/static/tests/functional/pages/network.js b/nailgun/static/tests/functional/pages/network.js
index 4ac0bf9d8b..b1424ea4e3 100644
--- a/nailgun/static/tests/functional/pages/network.js
+++ b/nailgun/static/tests/functional/pages/network.js
@@ -79,7 +79,8 @@ define([
         .then(function() {
           return self.modal.waitToClose();
         })
-        .waitForElementDeletion('.network-group-name[data-name=' + name + ']', 2000);
+        .waitForElementDeletion('.network-group-name[data-name=' + name + ']', 2000)
+        .sleep(3000); // unconditionally sleep to wait until update_dnsmasq task is finished
     }
   };
   return NetworkPage;
diff --git a/nailgun/static/tests/functional/test_cluster_dashboard.js b/nailgun/static/tests/functional/test_cluster_dashboard.js
index 8aeaed53b6..d8323975cf 100644
--- a/nailgun/static/tests/functional/test_cluster_dashboard.js
+++ b/nailgun/static/tests/functional/test_cluster_dashboard.js
@@ -97,7 +97,6 @@ define([
             .type('\uE00C')
             .end()
           .clickLinkByText('Environments')
-          .waitForCssSelector(clustersPage.clusterSelector, 2000)
           .then(function() {
             return clustersPage.goToEnvironment(initialName);
           });
diff --git a/nailgun/static/tests/functional/test_cluster_network.js b/nailgun/static/tests/functional/test_cluster_network.js
index fdecb4b00a..d87809f2d7 100644
--- a/nailgun/static/tests/functional/test_cluster_network.js
+++ b/nailgun/static/tests/functional/test_cluster_network.js
@@ -375,12 +375,14 @@ define([
               );
             })
           .clickByCssSelector('.subtab-link-neutron_l3')
+          .waitForCssSelector('.nav-pills.networks li.all', 1000)
           .assertElementTextEquals(
             '.nav-pills.networks li.all',
             'All Networks',
             'Navigation pill text is not changed when switching to neutron_l3 tab'
           )
           .clickByCssSelector('.subtab-link-all')
+          .waitForCssSelector('.network-group-name', 2000)
           .then(function() {
             return networkPage.removeNodeNetworkGroup('temp');
           })
@@ -394,7 +396,6 @@ define([
           .then(function() {
             return networkPage.addNodeNetworkGroup('Node_Network_Group_1');
           })
-          .waitForCssSelector('.network-group-name[data-name=Node_Network_Group_1]', 2000)
           .clickLinkByText('default')
           .assertElementsExist(
             '.node_network_groups li',