diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index eafaf081b77b80..4f86d73a769e98 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -209,7 +209,6 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visualize.toggleOtherBucket();
         await PageObjects.visualize.toggleMissingBucket();
         await PageObjects.visualize.clickGo();
-        await PageObjects.header.waitUntilLoadingHasFinished();
       });
 
       it('should show correct data', async () => {
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
index 8c755dffb72516..c3b1002c41bc1a 100644
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -81,7 +81,6 @@ export default function ({ getService, getPageObjects }) {
         ['160,000', '44'], ['200,000', '40'], ['240,000', '46'], ['280,000', '39'], ['320,000', '40'], ['360,000', '47']
       ];
 
-
       await PageObjects.visualize.openInspector();
       await PageObjects.visualize.setInspectorTablePageSize(50);
       const data =  await PageObjects.visualize.getInspectorTableData();
@@ -118,8 +117,9 @@ export default function ({ getService, getPageObjects }) {
       it('should apply correct filter on other bucket', async () => {
         const expectedTableData = [ 'Missing', 'osx' ];
 
-        await PageObjects.visualize.filterPieSlice('Other');
         await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.visualize.filterPieSlice('Other');
+        await PageObjects.visualize.waitForVisualization();
         const pieData = await PageObjects.visualize.getPieChartLabels();
         log.debug(`pieData.length = ${pieData.length}`);
         expect(pieData).to.eql(expectedTableData);
@@ -131,7 +131,7 @@ export default function ({ getService, getPageObjects }) {
 
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.visualize.filterLegend('Other');
-        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.visualize.waitForVisualization();
         const pieData = await PageObjects.visualize.getPieChartLabels();
         log.debug(`pieData.length = ${pieData.length}`);
         expect(pieData).to.eql(expectedTableData);
@@ -154,7 +154,6 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visualize.toggleMissingBucket();
         log.debug('clickGo');
         await PageObjects.visualize.clickGo();
-        await PageObjects.header.waitUntilLoadingHasFinished();
         const pieData = await PageObjects.visualize.getPieChartLabels();
         log.debug(`pieData.length = ${pieData.length}`);
         expect(pieData).to.eql(expectedTableData);