diff --git a/e2e/helpers/discover-helper.js b/e2e/helpers/discover-helper.js
index 2e6d8cfe..a6034289 100644
--- a/e2e/helpers/discover-helper.js
+++ b/e2e/helpers/discover-helper.js
@@ -83,5 +83,5 @@ helper.orderSelectorWrapper = function() {
 };
 
 helper.clearOrder = function() {
-    helper.orderSelectorWrapper().$('.results a').click();
+    helper.orderSelectorWrapper().$('.results').click();
 };
diff --git a/e2e/suites/discover/discover-home.e2e.js b/e2e/suites/discover/discover-home.e2e.js
index 2d369827..60387e61 100644
--- a/e2e/suites/discover/discover-home.e2e.js
+++ b/e2e/suites/discover/discover-home.e2e.js
@@ -60,6 +60,6 @@ describe('discover', () => {
     it('featured projects', async () => {
         let projects = discoverHelper.featuredProjects();
 
-        expect(await projects.count()).to.be.eventually.above(0);
+        expect(await projects.count()).to.be.above(0);
     });
 });
diff --git a/e2e/suites/discover/discover-search.e2e.js b/e2e/suites/discover/discover-search.e2e.js
index b51f3a45..9fa5bd02 100644
--- a/e2e/suites/discover/discover-search.e2e.js
+++ b/e2e/suites/discover/discover-search.e2e.js
@@ -27,7 +27,7 @@ describe('discover search', () => {
         it('filters', async () => {
             let htmlChanges = await utils.common.outerHtmlChanges(discoverHelper.searchProjectsList());
 
-            discoverHelper.searchFilter(1);
+            discoverHelper.searchFilter(3);
 
             await htmlChanges();
 
@@ -35,17 +35,17 @@ describe('discover search', () => {
 
             let projects = discoverHelper.searchProjects();
 
-            expect(projects.count()).to.be.eventually.above(0);
-            expect(url).to.be.equal(browser.params.glob.host + 'discover/search?filter=kanban');
+            expect(await projects.count()).to.be.above(0);
+            expect(url).to.be.equal(browser.params.glob.host + 'discover/search?filter=people');
         });
 
-        it('search by text', () => {
+        it('search by text', async () => {
             discoverHelper.searchInput().sendKeys('Project Example 0');
 
             discoverHelper.sendSearch();
 
             let projects = discoverHelper.searchProjects();
-            expect(projects.count()).to.be.eventually.equal(1);
+            expect(await projects.count()).to.be.equal(1);
         });
     });
 
@@ -72,16 +72,16 @@ describe('discover search', () => {
 
             let url = await browser.getCurrentUrl();
 
-            expect(projects.count()).to.be.eventually.above(0);
+            expect(await projects.count()).to.be.above(0);
             expect(url).to.be.equal(browser.params.glob.host + 'discover/search?order_by=-total_fans');
         });
 
-        it('clear', () => {
+        it('clear', async () => {
             discoverHelper.clearOrder();
 
             let orderSelector = discoverHelper.orderSelectorWrapper();
 
-            expect(orderSelector.isPresent()).to.be.eventually.equal(false);
+            expect(await orderSelector.isPresent()).to.be.equal(false);
         });
     });
 
@@ -108,16 +108,16 @@ describe('discover search', () => {
 
             let url = await browser.getCurrentUrl();
 
-            expect(projects.count()).to.be.eventually.above(0);
+            expect(await projects.count()).to.be.above(0);
             expect(url).to.be.equal(browser.params.glob.host + 'discover/search?order_by=-total_activity');
         });
 
-        it('clear', () => {
+        it('clear', async () => {
             discoverHelper.clearOrder();
 
             let orderSelector = discoverHelper.orderSelectorWrapper();
 
-            expect(orderSelector.isPresent()).to.be.eventually.equal(false);
+            expect(await orderSelector.isPresent()).to.be.equal(false);
         });
     });
 });