diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
index b89d193c7c751..36f5480e85406 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
@@ -102,7 +102,7 @@ exports[`ValueAxisOptions component should init with the default set of props 1`
     value=""
   />
   <LabelOptions
-    axisFilterCheckboxName="yAxisFilterLabelsCheckboxValueAxis-1"
+    axisFilterCheckboxName="yAxisFilterLabelsCheckbox-ValueAxis-1"
     axisLabels={
       Object {
         "color": "black",
diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
index 52962fe813b44..b42d038267d77 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
@@ -187,7 +187,7 @@ function ValueAxisOptions({
 
           <LabelOptions
             axisLabels={axis.labels}
-            axisFilterCheckboxName={`yAxisFilterLabelsCheckbox${axis.id}`}
+            axisFilterCheckboxName={`yAxisFilterLabelsCheckbox-${axis.id}`}
             setAxisLabel={setAxisLabel}
           />
         </>
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index 41e56986f677b..4321f0df89250 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -298,7 +298,7 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
-    describe.skip('switch between Y axis scale types', () => {
+    describe('switch between Y axis scale types', () => {
       before(initAreaChart);
       const axisId = 'ValueAxis-1';
 
@@ -308,57 +308,25 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
         await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
         await PageObjects.visEditor.clickGo();
-        const labels = await PageObjects.visChart.getYAxisLabels();
-        const expectedLabels = [
-          '2',
-          '3',
-          '5',
-          '7',
-          '10',
-          '20',
-          '30',
-          '50',
-          '70',
-          '100',
-          '200',
-          '300',
-          '500',
-          '700',
-          '1,000',
-          '2,000',
-          '3,000',
-          '5,000',
-          '7,000',
-        ];
-        expect(labels).to.eql(expectedLabels);
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
         await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
         await PageObjects.visEditor.clickGo();
-        const labels = await PageObjects.visChart.getYAxisLabels();
-        const expectedLabels = [
-          '2',
-          '3',
-          '5',
-          '7',
-          '10',
-          '20',
-          '30',
-          '50',
-          '70',
-          '100',
-          '200',
-          '300',
-          '500',
-          '700',
-          '1,000',
-          '2,000',
-          '3,000',
-          '5,000',
-          '7,000',
-        ];
-        expect(labels).to.eql(expectedLabels);
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
       it('should show ticks on selecting square root scale', async () => {
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index a492f3858b524..24e4ef4a7fe25 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -181,7 +181,7 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.visChart.waitForVisualization();
     });
 
-    describe.skip('switch between Y axis scale types', () => {
+    describe('switch between Y axis scale types', () => {
       before(initLineChart);
       const axisId = 'ValueAxis-1';
 
@@ -191,57 +191,25 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
         await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
         await PageObjects.visEditor.clickGo();
-        const labels = await PageObjects.visChart.getYAxisLabels();
-        const expectedLabels = [
-          '2',
-          '3',
-          '5',
-          '7',
-          '10',
-          '20',
-          '30',
-          '50',
-          '70',
-          '100',
-          '200',
-          '300',
-          '500',
-          '700',
-          '1,000',
-          '2,000',
-          '3,000',
-          '5,000',
-          '7,000',
-        ];
-        expect(labels).to.eql(expectedLabels);
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
         await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
         await PageObjects.visEditor.clickGo();
-        const labels = await PageObjects.visChart.getYAxisLabels();
-        const expectedLabels = [
-          '2',
-          '3',
-          '5',
-          '7',
-          '10',
-          '20',
-          '30',
-          '50',
-          '70',
-          '100',
-          '200',
-          '300',
-          '500',
-          '700',
-          '1,000',
-          '2,000',
-          '3,000',
-          '5,000',
-          '7,000',
-        ];
-        expect(labels).to.eql(expectedLabels);
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
       it('should show ticks on selecting square root scale', async () => {
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
index f1d83908b9b6d..ff0423eb531da 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -28,19 +28,28 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('vertical bar chart', function () {
+    const vizName1 = 'Visualization VerticalBarChart';
+
+    const initBarChart = async () => {
+      log.debug('navigateToApp visualize');
+      await PageObjects.visualize.navigateToNewVisualization();
+      log.debug('clickVerticalBarChart');
+      await PageObjects.visualize.clickVerticalBarChart();
+      await PageObjects.visualize.clickNewSearch();
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+      log.debug('Bucket = X-Axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
+      log.debug('Aggregation = Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      log.debug('Field = @timestamp');
+      await PageObjects.visEditor.selectField('@timestamp');
+      // leaving Interval set to Auto
+      await PageObjects.visEditor.clickGo();
+    };
+
     describe('bar charts x axis tick labels', () => {
       it('should show tick labels also after rotation of the chart', async function () {
-        await PageObjects.visualize.navigateToNewVisualization();
-        await PageObjects.visualize.clickVerticalBarChart();
-        await PageObjects.visualize.clickNewSearch();
-        await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visEditor.clickBucket('X-axis');
-        log.debug('Aggregation = Date Histogram');
-        await PageObjects.visEditor.selectAggregation('Date Histogram');
-        log.debug('Field = @timestamp');
-        await PageObjects.visEditor.selectField('@timestamp');
-        // leaving Interval set to Auto
-        await PageObjects.visEditor.clickGo();
+        await initBarChart();
         const bottomLabels = await PageObjects.visChart.getXAxisLabels();
         log.debug(`${bottomLabels.length} tick labels on bottom x axis`);
 
@@ -62,6 +71,7 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visEditor.clickBucket('X-axis');
         await PageObjects.visEditor.selectAggregation('Date Range');
         await PageObjects.visEditor.selectField('@timestamp');
+
         await PageObjects.visEditor.clickGo();
         const bottomLabels = await PageObjects.visChart.getXAxisLabels();
         expect(bottomLabels.length).to.be(1);
@@ -95,519 +105,456 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/22322
-    describe.skip('vertical bar chart flaky part', function () {
-      const vizName1 = 'Visualization VerticalBarChart';
+    it('should save and load', async function () {
+      await initBarChart();
+      await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
-      const initBarChart = async () => {
-        log.debug('navigateToApp visualize');
-        await PageObjects.visualize.navigateToNewVisualization();
-        log.debug('clickVerticalBarChart');
-        await PageObjects.visualize.clickVerticalBarChart();
-        await PageObjects.visualize.clickNewSearch();
-        await PageObjects.timePicker.setDefaultAbsoluteRange();
-        log.debug('Bucket = X-Axis');
-        await PageObjects.visEditor.clickBucket('X-axis');
-        log.debug('Aggregation = Date Histogram');
-        await PageObjects.visEditor.selectAggregation('Date Histogram');
-        log.debug('Field = @timestamp');
-        await PageObjects.visEditor.selectField('@timestamp');
-        // leaving Interval set to Auto
-        await PageObjects.visEditor.clickGo();
-      };
+      await PageObjects.visualize.loadSavedVisualization(vizName1);
+      await PageObjects.visChart.waitForVisualization();
+    });
 
-      before(initBarChart);
+    it('should have inspector enabled', async function () {
+      await inspector.expectIsEnabled();
+    });
 
-      it('should save and load', async function () {
-        await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
+    it('should show correct chart', async function () {
+      const expectedChartValues = [
+        37,
+        202,
+        740,
+        1437,
+        1371,
+        751,
+        188,
+        31,
+        42,
+        202,
+        683,
+        1361,
+        1415,
+        707,
+        177,
+        27,
+        32,
+        175,
+        707,
+        1408,
+        1355,
+        726,
+        201,
+        29,
+      ];
+
+      // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
+      // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
+      // try sleeping a bit before getting that data
+      await retry.try(async () => {
+        const data = await PageObjects.visChart.getBarChartData();
+        log.debug('data=' + data);
+        log.debug('data.length=' + data.length);
+        expect(data).to.eql(expectedChartValues);
+      });
+    });
 
-        await PageObjects.visualize.loadSavedVisualization(vizName1);
-        await PageObjects.visChart.waitForVisualization();
+    it('should show correct data', async function () {
+      // this is only the first page of the tabular data.
+      const expectedChartData = [
+        ['2015-09-20 00:00', '37'],
+        ['2015-09-20 03:00', '202'],
+        ['2015-09-20 06:00', '740'],
+        ['2015-09-20 09:00', '1,437'],
+        ['2015-09-20 12:00', '1,371'],
+        ['2015-09-20 15:00', '751'],
+        ['2015-09-20 18:00', '188'],
+        ['2015-09-20 21:00', '31'],
+        ['2015-09-21 00:00', '42'],
+        ['2015-09-21 03:00', '202'],
+        ['2015-09-21 06:00', '683'],
+        ['2015-09-21 09:00', '1,361'],
+        ['2015-09-21 12:00', '1,415'],
+        ['2015-09-21 15:00', '707'],
+        ['2015-09-21 18:00', '177'],
+        ['2015-09-21 21:00', '27'],
+        ['2015-09-22 00:00', '32'],
+        ['2015-09-22 03:00', '175'],
+        ['2015-09-22 06:00', '707'],
+        ['2015-09-22 09:00', '1,408'],
+      ];
+
+      await inspector.open();
+      await inspector.expectTableData(expectedChartData);
+      await inspector.close();
+    });
+
+    it('should have `drop partial buckets` option', async () => {
+      const fromTime = 'Sep 20, 2015 @ 06:31:44.000';
+      const toTime = 'Sep 22, 2015 @ 18:31:44.000';
+
+      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+
+      let expectedChartValues = [
+        82,
+        218,
+        341,
+        440,
+        480,
+        517,
+        522,
+        446,
+        403,
+        321,
+        258,
+        172,
+        95,
+        55,
+        38,
+        24,
+        3,
+        4,
+        11,
+        14,
+        17,
+        38,
+        49,
+        115,
+        152,
+        216,
+        315,
+        402,
+        446,
+        513,
+        520,
+        474,
+        421,
+        307,
+        230,
+        170,
+        99,
+        48,
+        30,
+        15,
+        10,
+        2,
+        8,
+        7,
+        17,
+        34,
+        37,
+        104,
+        153,
+        241,
+        313,
+        404,
+        492,
+        512,
+        503,
+        473,
+        379,
+        293,
+        277,
+        156,
+        56,
+      ];
+
+      // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
+      // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
+      // try sleeping a bit before getting that data
+      await retry.try(async () => {
+        const data = await PageObjects.visChart.getBarChartData();
+        log.debug('data=' + data);
+        log.debug('data.length=' + data.length);
+        expect(data).to.eql(expectedChartValues);
       });
 
-      it('should have inspector enabled', async function () {
-        await inspector.expectIsEnabled();
+      await PageObjects.visEditor.toggleOpenEditor(2);
+      await PageObjects.visEditor.clickDropPartialBuckets();
+      await PageObjects.visEditor.clickGo();
+
+      expectedChartValues = [
+        218,
+        341,
+        440,
+        480,
+        517,
+        522,
+        446,
+        403,
+        321,
+        258,
+        172,
+        95,
+        55,
+        38,
+        24,
+        3,
+        4,
+        11,
+        14,
+        17,
+        38,
+        49,
+        115,
+        152,
+        216,
+        315,
+        402,
+        446,
+        513,
+        520,
+        474,
+        421,
+        307,
+        230,
+        170,
+        99,
+        48,
+        30,
+        15,
+        10,
+        2,
+        8,
+        7,
+        17,
+        34,
+        37,
+        104,
+        153,
+        241,
+        313,
+        404,
+        492,
+        512,
+        503,
+        473,
+        379,
+        293,
+        277,
+        156,
+      ];
+
+      // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
+      // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
+      // try sleeping a bit before getting that data
+      await retry.try(async () => {
+        const data = await PageObjects.visChart.getBarChartData();
+        log.debug('data=' + data);
+        log.debug('data.length=' + data.length);
+        expect(data).to.eql(expectedChartValues);
       });
+    });
 
-      it('should show correct chart', async function () {
-        const expectedChartValues = [
-          37,
-          202,
-          740,
-          1437,
-          1371,
-          751,
-          188,
-          31,
-          42,
-          202,
-          683,
-          1361,
-          1415,
-          707,
-          177,
-          27,
-          32,
-          175,
-          707,
-          1408,
-          1355,
-          726,
-          201,
-          29,
-        ];
+    describe('switch between Y axis scale types', () => {
+      before(initBarChart);
+      const axisId = 'ValueAxis-1';
 
-        // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
-        // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
-        // try sleeping a bit before getting that data
-        await retry.try(async () => {
-          const data = await PageObjects.visChart.getBarChartData();
-          log.debug('data=' + data);
-          log.debug('data.length=' + data.length);
-          expect(data).to.eql(expectedChartValues);
-        });
+      it('should show ticks on selecting log scale', async () => {
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
-      it('should show correct data', async function () {
-        // this is only the first page of the tabular data.
-        const expectedChartData = [
-          ['2015-09-20 00:00', '37'],
-          ['2015-09-20 03:00', '202'],
-          ['2015-09-20 06:00', '740'],
-          ['2015-09-20 09:00', '1,437'],
-          ['2015-09-20 12:00', '1,371'],
-          ['2015-09-20 15:00', '751'],
-          ['2015-09-20 18:00', '188'],
-          ['2015-09-20 21:00', '31'],
-          ['2015-09-21 00:00', '42'],
-          ['2015-09-21 03:00', '202'],
-          ['2015-09-21 06:00', '683'],
-          ['2015-09-21 09:00', '1,361'],
-          ['2015-09-21 12:00', '1,415'],
-          ['2015-09-21 15:00', '707'],
-          ['2015-09-21 18:00', '177'],
-          ['2015-09-21 21:00', '27'],
-          ['2015-09-22 00:00', '32'],
-          ['2015-09-22 03:00', '175'],
-          ['2015-09-22 06:00', '707'],
-          ['2015-09-22 09:00', '1,408'],
-        ];
-
-        await inspector.open();
-        await inspector.expectTableData(expectedChartData);
-        await inspector.close();
+      it('should show filtered ticks on selecting log scale', async () => {
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
-      it('should have `drop partial buckets` option', async () => {
-        const fromTime = 'Sep 20, 2015 @ 06:31:44.000';
-        const toTime = 'Sep 22, 2015 @ 18:31:44.000';
-
-        await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-
-        let expectedChartValues = [
-          82,
-          218,
-          341,
-          440,
-          480,
-          517,
-          522,
-          446,
-          403,
-          321,
-          258,
-          172,
-          95,
-          55,
-          38,
-          24,
-          3,
-          4,
-          11,
-          14,
-          17,
-          38,
-          49,
-          115,
-          152,
-          216,
-          315,
-          402,
-          446,
-          513,
-          520,
-          474,
-          421,
-          307,
-          230,
-          170,
-          99,
-          48,
-          30,
-          15,
-          10,
-          2,
-          8,
-          7,
-          17,
-          34,
-          37,
-          104,
-          153,
-          241,
-          313,
-          404,
-          492,
-          512,
-          503,
-          473,
-          379,
-          293,
-          277,
-          156,
-          56,
+      it('should show ticks on selecting square root scale', async () => {
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
+        const expectedLabels = [
+          '0',
+          '200',
+          '400',
+          '600',
+          '800',
+          '1,000',
+          '1,200',
+          '1,400',
+          '1,600',
         ];
+        expect(labels).to.eql(expectedLabels);
+      });
 
-        // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
-        // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
-        // try sleeping a bit before getting that data
-        await retry.try(async () => {
-          const data = await PageObjects.visChart.getBarChartData();
-          log.debug('data=' + data);
-          log.debug('data.length=' + data.length);
-          expect(data).to.eql(expectedChartValues);
-        });
-
-        await PageObjects.visEditor.toggleOpenEditor(2);
-        await PageObjects.visEditor.clickDropPartialBuckets();
+      it('should show filtered ticks on selecting square root scale', async () => {
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
         await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
+        const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
+        expect(labels).to.eql(expectedLabels);
+      });
 
-        expectedChartValues = [
-          218,
-          341,
-          440,
-          480,
-          517,
-          522,
-          446,
-          403,
-          321,
-          258,
-          172,
-          95,
-          55,
-          38,
-          24,
-          3,
-          4,
-          11,
-          14,
-          17,
-          38,
-          49,
-          115,
-          152,
-          216,
-          315,
-          402,
-          446,
-          513,
-          520,
-          474,
-          421,
-          307,
-          230,
-          170,
-          99,
-          48,
-          30,
-          15,
-          10,
-          2,
-          8,
-          7,
-          17,
-          34,
-          37,
-          104,
-          153,
-          241,
-          313,
-          404,
-          492,
-          512,
-          503,
-          473,
-          379,
-          293,
-          277,
-          156,
+      it('should show ticks on selecting linear scale', async () => {
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
+        log.debug(labels);
+        const expectedLabels = [
+          '0',
+          '200',
+          '400',
+          '600',
+          '800',
+          '1,000',
+          '1,200',
+          '1,400',
+          '1,600',
         ];
+        expect(labels).to.eql(expectedLabels);
+      });
 
-        // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
-        // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
-        // try sleeping a bit before getting that data
-        await retry.try(async () => {
-          const data = await PageObjects.visChart.getBarChartData();
-          log.debug('data=' + data);
-          log.debug('data.length=' + data.length);
-          expect(data).to.eql(expectedChartValues);
-        });
+      it('should show filtered ticks on selecting linear scale', async () => {
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
+        const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
+        expect(labels).to.eql(expectedLabels);
       });
+    });
 
-      describe('switch between Y axis scale types', () => {
-        before(initBarChart);
+    describe('vertical bar in percent mode', async () => {
+      it('should show ticks with percentage values', async function () {
         const axisId = 'ValueAxis-1';
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisMode('percentage');
+        await PageObjects.visEditor.changeYAxisShowCheckbox(axisId, true);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
+        expect(labels[0]).to.eql('0%');
+        expect(labels[labels.length - 1]).to.eql('100%');
+      });
+    });
 
-        it('should show ticks on selecting log scale', async () => {
-          await PageObjects.visEditor.clickMetricsAndAxes();
-          await PageObjects.visEditor.clickYAxisOptions(axisId);
-          await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          const expectedLabels = [
-            '2',
-            '3',
-            '4',
-            '5',
-            '7',
-            '9',
-            '20',
-            '30',
-            '40',
-            '50',
-            '70',
-            '90',
-            '200',
-            '300',
-            '400',
-            '500',
-            '700',
-            '900',
-            '2,000',
-            '3,000',
-            '4,000',
-            '5,000',
-            '7,000',
-          ];
-          expect(labels).to.eql(expectedLabels);
-        });
-
-        it('should show filtered ticks on selecting log scale', async () => {
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          const expectedLabels = [
-            '2',
-            '3',
-            '4',
-            '5',
-            '7',
-            '9',
-            '20',
-            '30',
-            '40',
-            '50',
-            '70',
-            '90',
-            '200',
-            '300',
-            '400',
-            '500',
-            '700',
-            '900',
-            '2,000',
-            '3,000',
-            '4,000',
-            '5,000',
-            '7,000',
-          ];
-          expect(labels).to.eql(expectedLabels);
-        });
-
-        it('should show ticks on selecting square root scale', async () => {
-          await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          const expectedLabels = [
-            '0',
-            '200',
-            '400',
-            '600',
-            '800',
-            '1,000',
-            '1,200',
-            '1,400',
-            '1,600',
-          ];
-          expect(labels).to.eql(expectedLabels);
-        });
-
-        it('should show filtered ticks on selecting square root scale', async () => {
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
-          expect(labels).to.eql(expectedLabels);
-        });
-
-        it('should show ticks on selecting linear scale', async () => {
-          await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          log.debug(labels);
-          const expectedLabels = [
-            '0',
-            '200',
-            '400',
-            '600',
-            '800',
-            '1,000',
-            '1,200',
-            '1,400',
-            '1,600',
-          ];
-          expect(labels).to.eql(expectedLabels);
-        });
-
-        it('should show filtered ticks on selecting linear scale', async () => {
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
-          expect(labels).to.eql(expectedLabels);
-        });
+    describe('vertical bar with Split series', function () {
+      before(initBarChart);
+
+      it('should show correct series', async function () {
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
+
+        const expectedEntries = ['200', '404', '503'];
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
+        expect(legendEntries).to.eql(expectedEntries);
       });
 
-      describe('vertical bar in percent mode', async () => {
-        it('should show ticks with percentage values', async function () {
-          const axisId = 'ValueAxis-1';
-          await PageObjects.visEditor.clickMetricsAndAxes();
-          await PageObjects.visEditor.clickYAxisOptions(axisId);
-          await PageObjects.visEditor.selectYAxisMode('percentage');
-          await PageObjects.visEditor.changeYAxisShowCheckbox(axisId, true);
-          await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
-          await PageObjects.visEditor.clickGo();
-          const labels = await PageObjects.visChart.getYAxisLabels();
-          expect(labels[0]).to.eql('0%');
-          expect(labels[labels.length - 1]).to.eql('100%');
-        });
+      it('should allow custom sorting of series', async () => {
+        await PageObjects.visEditor.toggleOpenEditor(1, 'false');
+        await PageObjects.visEditor.selectCustomSortMetric(3, 'Min', 'bytes');
+        await PageObjects.visEditor.clickGo();
+
+        const expectedEntries = ['404', '200', '503'];
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
+        expect(legendEntries).to.eql(expectedEntries);
       });
 
-      describe('vertical bar with Split series', function () {
-        before(initBarChart);
-
-        it('should show correct series', async function () {
-          await PageObjects.visEditor.toggleOpenEditor(2, 'false');
-          await PageObjects.visEditor.clickBucket('Split series');
-          await PageObjects.visEditor.selectAggregation('Terms');
-          await PageObjects.visEditor.selectField('response.raw');
-          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-          await PageObjects.visEditor.clickGo();
-
-          const expectedEntries = ['200', '404', '503'];
-          const legendEntries = await PageObjects.visChart.getLegendEntries();
-          expect(legendEntries).to.eql(expectedEntries);
-        });
-
-        it('should allow custom sorting of series', async () => {
-          await PageObjects.visEditor.toggleOpenEditor(1, 'false');
-          await PageObjects.visEditor.selectCustomSortMetric(3, 'Min', 'bytes');
-          await PageObjects.visEditor.clickGo();
-
-          const expectedEntries = ['404', '200', '503'];
-          const legendEntries = await PageObjects.visChart.getLegendEntries();
-          expect(legendEntries).to.eql(expectedEntries);
-        });
-
-        it('should correctly filter by legend', async () => {
-          await PageObjects.visChart.filterLegend('200');
-          await PageObjects.visChart.waitForVisualization();
-          const legendEntries = await PageObjects.visChart.getLegendEntries();
-          const expectedEntries = ['200'];
-          expect(legendEntries).to.eql(expectedEntries);
-          await filterBar.removeFilter('response.raw');
-          await PageObjects.visChart.waitForVisualization();
-        });
+      it('should correctly filter by legend', async () => {
+        await PageObjects.visChart.filterLegend('200');
+        await PageObjects.visChart.waitForVisualization();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
+        const expectedEntries = ['200'];
+        expect(legendEntries).to.eql(expectedEntries);
+        await filterBar.removeFilter('response.raw');
+        await PageObjects.visChart.waitForVisualization();
       });
+    });
 
-      describe('vertical bar with multiple splits', function () {
-        before(initBarChart);
-
-        it('should show correct series', async function () {
-          await PageObjects.visEditor.toggleOpenEditor(2, 'false');
-          await PageObjects.visEditor.clickBucket('Split series');
-          await PageObjects.visEditor.selectAggregation('Terms');
-          await PageObjects.visEditor.selectField('response.raw');
-          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-
-          await PageObjects.visEditor.toggleOpenEditor(3, 'false');
-          await PageObjects.visEditor.clickBucket('Split series');
-          await PageObjects.visEditor.selectAggregation('Terms');
-          await PageObjects.visEditor.selectField('machine.os');
-          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-          await PageObjects.visEditor.clickGo();
-
-          const expectedEntries = [
-            '200 - win 8',
-            '200 - win xp',
-            '200 - ios',
-            '200 - osx',
-            '200 - win 7',
-            '404 - ios',
-            '503 - ios',
-            '503 - osx',
-            '503 - win 7',
-            '503 - win 8',
-            '503 - win xp',
-            '404 - osx',
-            '404 - win 7',
-            '404 - win 8',
-            '404 - win xp',
-          ];
-          const legendEntries = await PageObjects.visChart.getLegendEntries();
-          expect(legendEntries).to.eql(expectedEntries);
-        });
-
-        it('should show correct series when disabling first agg', async function () {
-          // this will avoid issues with the play tooltip covering the disable agg button
-          await testSubjects.scrollIntoView('metricsAggGroup');
-          await PageObjects.visEditor.toggleDisabledAgg(3);
-          await PageObjects.visEditor.clickGo();
-
-          const expectedEntries = ['win 8', 'win xp', 'ios', 'osx', 'win 7'];
-          const legendEntries = await PageObjects.visChart.getLegendEntries();
-          expect(legendEntries).to.eql(expectedEntries);
-        });
+    describe('vertical bar with multiple splits', function () {
+      before(initBarChart);
+
+      it('should show correct series', async function () {
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
+
+        const expectedEntries = [
+          '200 - win 8',
+          '200 - win xp',
+          '200 - ios',
+          '200 - osx',
+          '200 - win 7',
+          '404 - ios',
+          '503 - ios',
+          '503 - osx',
+          '503 - win 7',
+          '503 - win 8',
+          '503 - win xp',
+          '404 - osx',
+          '404 - win 7',
+          '404 - win 8',
+          '404 - win xp',
+        ];
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
+        expect(legendEntries).to.eql(expectedEntries);
+      });
+
+      it('should show correct series when disabling first agg', async function () {
+        // this will avoid issues with the play tooltip covering the disable agg button
+        await testSubjects.scrollIntoView('metricsAggGroup');
+        await PageObjects.visEditor.toggleDisabledAgg(3);
+        await PageObjects.visEditor.clickGo();
+
+        const expectedEntries = ['win 8', 'win xp', 'ios', 'osx', 'win 7'];
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
+        expect(legendEntries).to.eql(expectedEntries);
       });
+    });
+
+    describe('vertical bar with derivative', function () {
+      before(initBarChart);
+
+      it('should show correct series', async function () {
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.selectAggregation('Derivative', 'metrics');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
+
+        const expectedEntries = ['Derivative of Count'];
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
+        expect(legendEntries).to.eql(expectedEntries);
+      });
+
+      it('should show an error if last bucket aggregation is terms', async () => {
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
 
-      describe('vertical bar with derivative', function () {
-        before(initBarChart);
-
-        it('should show correct series', async function () {
-          await PageObjects.visEditor.toggleOpenEditor(2, 'false');
-          await PageObjects.visEditor.toggleOpenEditor(1);
-          await PageObjects.visEditor.selectAggregation('Derivative', 'metrics');
-          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-          await PageObjects.visEditor.clickGo();
-
-          const expectedEntries = ['Derivative of Count'];
-          const legendEntries = await PageObjects.visChart.getLegendEntries();
-          expect(legendEntries).to.eql(expectedEntries);
-        });
-
-        it('should show an error if last bucket aggregation is terms', async () => {
-          await PageObjects.visEditor.toggleOpenEditor(2, 'false');
-          await PageObjects.visEditor.clickBucket('Split series');
-          await PageObjects.visEditor.selectAggregation('Terms');
-          await PageObjects.visEditor.selectField('response.raw');
-
-          const errorMessage = await PageObjects.visEditor.getBucketErrorMessage();
-          expect(errorMessage).to.contain('Last bucket aggregation must be "Date Histogram"');
-        });
+        const errorMessage = await PageObjects.visEditor.getBucketErrorMessage();
+        expect(errorMessage).to.contain('Last bucket aggregation must be "Date Histogram"');
       });
     });
   });
diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
index 42dfd791321a1..f95781c9bbb33 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
@@ -25,8 +25,7 @@ export default function ({ getService, getPageObjects }) {
   const inspector = getService('inspector');
   const PageObjects = getPageObjects(['common', 'visualize', 'header', 'visEditor', 'visChart']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/22322
-  describe.skip('vertical bar chart with index without time filter', function () {
+  describe('vertical bar chart with index without time filter', function () {
     const vizName1 = 'Visualization VerticalBarChart without time filter';
 
     const initBarChart = async () => {
@@ -46,6 +45,7 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.visEditor.selectField('@timestamp');
       await PageObjects.visEditor.setInterval('3h', { type: 'custom' });
       await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.clickGo();
     };
 
     before(initBarChart);
@@ -129,7 +129,7 @@ export default function ({ getService, getPageObjects }) {
       await inspector.expectTableData(expectedChartData);
     });
 
-    describe.skip('switch between Y axis scale types', () => {
+    describe('switch between Y axis scale types', () => {
       before(initBarChart);
       const axisId = 'ValueAxis-1';
 
@@ -139,57 +139,25 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
         await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
         await PageObjects.visEditor.clickGo();
-        const labels = await PageObjects.visChart.getYAxisLabels();
-        const expectedLabels = [
-          '2',
-          '3',
-          '5',
-          '7',
-          '10',
-          '20',
-          '30',
-          '50',
-          '70',
-          '100',
-          '200',
-          '300',
-          '500',
-          '700',
-          '1,000',
-          '2,000',
-          '3,000',
-          '5,000',
-          '7,000',
-        ];
-        expect(labels).to.eql(expectedLabels);
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
         await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
         await PageObjects.visEditor.clickGo();
-        const labels = await PageObjects.visChart.getYAxisLabels();
-        const expectedLabels = [
-          '2',
-          '3',
-          '5',
-          '7',
-          '10',
-          '20',
-          '30',
-          '50',
-          '70',
-          '100',
-          '200',
-          '300',
-          '500',
-          '700',
-          '1,000',
-          '2,000',
-          '3,000',
-          '5,000',
-          '7,000',
-        ];
-        expect(labels).to.eql(expectedLabels);
+        const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
+        const minLabel = 2;
+        const maxLabel = 5000;
+        const numberOfLabels = 10;
+        expect(labels.length).to.be.greaterThan(numberOfLabels);
+        expect(labels[0]).to.eql(minLabel);
+        expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
       });
 
       it('should show ticks on selecting square root scale', async () => {
diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
index 590631ad48b00..ade78cbb810d5 100644
--- a/test/functional/page_objects/visualize_chart_page.ts
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -51,6 +51,10 @@ export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrPr
         .map((tick) => $(tick).text().trim());
     }
 
+    public async getYAxisLabelsAsNumbers() {
+      return (await this.getYAxisLabels()).map((label) => Number(label.replace(',', '')));
+    }
+
     /**
      * Gets the chart data and scales it based on chart height and label.
      * @param dataLabel data-label value