diff --git a/test/functional/apps/console/_console.js b/test/functional/apps/console/_console.js
index 64d7190f57709..ddadabe106dd7 100644
--- a/test/functional/apps/console/_console.js
+++ b/test/functional/apps/console/_console.js
@@ -14,7 +14,6 @@ GET _search
 export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const log = getService('log');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'console']);
 
   describe('console app', function describeIndexTests() {
@@ -24,11 +23,9 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('should show the default request', function () {
-      screenshots.take('Console-help-expanded');
       // collapse the help pane because we only get the VISIBLE TEXT, not the part that is scrolled
       return PageObjects.console.collapseHelp()
       .then(function () {
-        screenshots.take('Console-help-collapsed');
         return retry.try(function () {
           return PageObjects.console.getRequest()
           .then(function (actualRequest) {
@@ -43,7 +40,6 @@ export default function ({ getService, getPageObjects }) {
 
       return PageObjects.console.clickPlay()
       .then(function () {
-        screenshots.take('Console-default-request');
         return retry.try(function () {
           return PageObjects.console.getResponse()
           .then(function (actualResponse) {
diff --git a/test/functional/apps/dashboard/_dashboard.js b/test/functional/apps/dashboard/_dashboard.js
index bd1f24db015ec..c187e1043a015 100644
--- a/test/functional/apps/dashboard/_dashboard.js
+++ b/test/functional/apps/dashboard/_dashboard.js
@@ -13,7 +13,6 @@ export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const log = getService('log');
   const remote = getService('remote');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize']);
 
   describe('dashboard tab', function describeIndexTests() {
@@ -30,8 +29,6 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('should be able to add visualizations to dashboard', async function addVisualizations() {
-      await screenshots.take('Dashboard-no-visualizations');
-
       // This flip between apps fixes the url so state is preserved when switching apps in test mode.
       // Without this flip the url in test mode looks something like
       // "http://localhost:5620/app/kibana?_t=1486069030837#/dashboard?_g=...."
@@ -43,7 +40,6 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.dashboard.addVisualizations(PageObjects.dashboard.getTestVisualizationNames());
 
       log.debug('done adding visualizations');
-      await screenshots.take('Dashboard-add-visualizations');
     });
 
     it('set the timepicker time to that which contains our test data', async function setTimepicker() {
@@ -60,7 +56,6 @@ export default function ({ getService, getPageObjects }) {
         log.debug('now re-load previously saved dashboard');
         return PageObjects.dashboard.loadSavedDashboard(dashboardName);
       });
-      await screenshots.take('Dashboard-load-saved');
     });
 
     it('should have all the expected visualizations', function checkVisualizations() {
@@ -72,7 +67,6 @@ export default function ({ getService, getPageObjects }) {
         });
       })
       .then(function () {
-        screenshots.take('Dashboard-has-visualizations');
       });
     });
 
@@ -93,7 +87,6 @@ export default function ({ getService, getPageObjects }) {
         return PageObjects.dashboard.getPanelSizeData()
           .then(function (panelTitles) {
             log.info('visualization titles = ' + panelTitles);
-            screenshots.take('Dashboard-visualization-sizes');
             expect(panelTitles).to.eql(visObjects);
           });
       });
@@ -306,7 +299,6 @@ export default function ({ getService, getPageObjects }) {
         return retry.tryForTime(10000, async function () {
           const panelTitles = await PageObjects.dashboard.getPanelSizeData();
           log.info('visualization titles = ' + panelTitles.map(item => item.title));
-          screenshots.take('Dashboard-visualization-sizes');
           expect(panelTitles.length).to.eql(visualizations.length + 1);
         });
       });
diff --git a/test/functional/apps/discover/_collapse_expand.js b/test/functional/apps/discover/_collapse_expand.js
index 0fb0a11cc2d58..c754d56b2ecbe 100644
--- a/test/functional/apps/discover/_collapse_expand.js
+++ b/test/functional/apps/discover/_collapse_expand.js
@@ -4,7 +4,6 @@ export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'discover', 'header']);
 
   describe('discover tab', function describeIndexTests() {
@@ -37,7 +36,6 @@ export default function ({ getService, getPageObjects }) {
 
     describe('field data', function () {
       it('should initially be expanded', function () {
-        screenshots.take('Discover-sidebar-expanded');
         return PageObjects.discover.getSidebarWidth()
           .then(function (width) {
             log.debug('expanded sidebar width = ' + width);
@@ -48,7 +46,6 @@ export default function ({ getService, getPageObjects }) {
       it('should collapse when clicked', function () {
         return PageObjects.discover.toggleSidebarCollapse()
           .then(function () {
-            screenshots.take('Discover-sidebar-collapsed');
             log.debug('PageObjects.discover.getSidebarWidth()');
             return PageObjects.discover.getSidebarWidth();
           })
diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js
index 2142838b20ad8..2fa374f0982c8 100644
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@@ -6,7 +6,6 @@ export default function ({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
   const remote = getService('remote');
   const kibanaServer = getService('kibanaServer');
-  const screenshots = getService('screenshots');
   const queryBar = getService('queryBar');
   const filterBar = getService('filterBar');
   const PageObjects = getPageObjects(['common', 'discover', 'header']);
@@ -52,7 +51,6 @@ export default function ({ getService, getPageObjects }) {
 
         const expectedToastMessage = `Discover: Saved Data Source "${queryName1}"`;
         expect(toastMessage).to.be(expectedToastMessage);
-        await screenshots.take('Discover-save-query-toast');
 
         await PageObjects.header.waitForToastMessageGone();
         const actualQueryNameString = await PageObjects.discover.getCurrentQueryName();
@@ -66,7 +64,6 @@ export default function ({ getService, getPageObjects }) {
         await retry.try(async function () {
           expect(await PageObjects.discover.getCurrentQueryName()).to.be(queryName1);
         });
-        await screenshots.take('Discover-load-query');
       });
 
       it('should show the correct hit count', async function () {
@@ -212,7 +209,6 @@ export default function ({ getService, getPageObjects }) {
       it('should show "no results"', async () => {
         const isVisible = await PageObjects.discover.hasNoResults();
         expect(isVisible).to.be(true);
-        await screenshots.take('Discover-no-results');
       });
 
       it('should suggest a new time range is picked', async () => {
diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js
index 5b58f540fd475..738df873c661c 100644
--- a/test/functional/apps/discover/_field_data.js
+++ b/test/functional/apps/discover/_field_data.js
@@ -4,7 +4,6 @@ export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'header', 'discover']);
 
   describe('discover app', function describeIndexTests() {
@@ -34,7 +33,6 @@ export default function ({ getService, getPageObjects }) {
           return retry.try(function tryingForTime() {
             return PageObjects.discover.getHitCount()
             .then(function compareData(hitCount) {
-              screenshots.take('Discover-field-data');
               expect(hitCount).to.be(expectedHitCount);
             });
           });
@@ -207,7 +205,6 @@ export default function ({ getService, getPageObjects }) {
           return retry.try(function tryingForTime() {
             return PageObjects.discover.getDocTableIndex(1)
             .then(function (rowData) {
-              screenshots.take('Discover-sort-down');
               expect(rowData).to.be(ExpectedDoc);
             });
           });
@@ -222,7 +219,6 @@ export default function ({ getService, getPageObjects }) {
           return PageObjects.header.getToastMessage();
         })
         .then(function (toastMessage) {
-          screenshots.take('Discover-syntax-error-toast');
           expect(toastMessage).to.contain(expectedError);
         })
         .then(function () {
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
index 4ff1f1698c04a..8fee36c8d4fcb 100644
--- a/test/functional/apps/discover/_shared_links.js
+++ b/test/functional/apps/discover/_shared_links.js
@@ -5,7 +5,6 @@ export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'discover', 'header']);
 
   describe('shared links', function describeIndexTests() {
@@ -61,7 +60,6 @@ export default function ({ getService, getPageObjects }) {
         const expectedCaption = 'Share saved';
         return PageObjects.discover.clickShare()
         .then(function () {
-          screenshots.take('Discover-share-link');
           return PageObjects.discover.getShareCaption();
         })
         .then(function (actualCaption) {
@@ -91,7 +89,6 @@ export default function ({ getService, getPageObjects }) {
           return PageObjects.header.getToastMessage();
         })
         .then(function (toastMessage) {
-          screenshots.take('Discover-copy-to-clipboard-toast');
           expect(toastMessage).to.match(expectedToastMessage);
         })
         .then(function () {
@@ -105,7 +102,6 @@ export default function ({ getService, getPageObjects }) {
         return PageObjects.discover.clickShortenUrl()
         .then(function () {
           return retry.try(function tryingForTime() {
-            screenshots.take('Discover-shorten-url-button');
             return PageObjects.discover.getSharedUrl()
             .then(function (actualUrl) {
               expect(actualUrl).to.match(re);
diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
index 561a6096a552a..70fa42cea4123 100644
--- a/test/functional/apps/management/_index_pattern_create_delete.js
+++ b/test/functional/apps/management/_index_pattern_create_delete.js
@@ -5,7 +5,6 @@ export default function ({ getService, getPageObjects }) {
   const remote = getService('remote');
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['settings', 'common']);
 
   describe('creating and deleting default index', function describeIndexTests() {
@@ -31,7 +30,6 @@ export default function ({ getService, getPageObjects }) {
       it('should have index pattern in page header', async function () {
         const indexPageHeading = await PageObjects.settings.getIndexPageHeading();
         const patternName = await indexPageHeading.getVisibleText();
-        screenshots.take('Settings-indices-new-index-pattern');
         expect(patternName).to.be('logstash-*');
       });
 
@@ -77,7 +75,6 @@ export default function ({ getService, getPageObjects }) {
         const expectedAlertText = 'Are you sure you want to remove this index pattern?';
         return PageObjects.settings.removeIndexPattern()
         .then(function (alertText) {
-          screenshots.take('Settings-indices-confirm-remove-index-pattern');
           expect(alertText).to.be(expectedAlertText);
         });
       });
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index 0aa2ddb3da1a7..eefe6eaf7182b 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const log = getService('log');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['settings', 'common']);
 
   describe('index result popularity', function describeIndexTests() {
@@ -52,7 +51,6 @@ export default function ({ getService, getPageObjects }) {
         const popularity = await PageObjects.settings.getPopularity();
         log.debug('popularity = ' + popularity);
         expect(popularity).to.be('1');
-        screenshots.take('Settings-indices-result-popularity-updated');
       });
 
       it('should be reset on cancel', async function () {
@@ -74,7 +72,6 @@ export default function ({ getService, getPageObjects }) {
         const popularity = await PageObjects.settings.getPopularity();
         log.debug('popularity = ' + popularity);
         expect(popularity).to.be('1');
-        screenshots.take('Settings-indices-result-popularity-saved');
       });
     }); // end 'change popularity'
   }); // end index result popularity
diff --git a/test/functional/apps/management/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js
index a8c5a8f03b057..92dec531ad232 100644
--- a/test/functional/apps/management/_index_pattern_results_sort.js
+++ b/test/functional/apps/management/_index_pattern_results_sort.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['settings', 'common']);
 
   describe('index result field sort', function describeIndexTests() {
@@ -51,7 +50,6 @@ export default function ({ getService, getPageObjects }) {
             return col.selector();
           })
           .then(function (rowText) {
-            screenshots.take(`Settings-indices-column-${col.heading}-sort-ascending`);
             expect(rowText).to.be(col.first);
           });
         });
@@ -65,7 +63,6 @@ export default function ({ getService, getPageObjects }) {
             return col.selector();
           })
           .then(function (rowText) {
-            screenshots.take(`Settings-indices-column-${col.heading}-sort-descending`);
             expect(rowText).to.be(col.last);
           });
         });
@@ -109,7 +106,6 @@ export default function ({ getService, getPageObjects }) {
         for (let pageNum = 1; pageNum <= LAST_PAGE_NUMBER; pageNum += 1) {
           await PageObjects.settings.goToPage(pageNum);
           const pageFieldNames = await retry.tryMethod(PageObjects.settings, 'getFieldNames');
-          await screenshots.take(`Settings-indexed-fields-page-${pageNum}`);
 
           if (pageNum === LAST_PAGE_NUMBER) {
             expect(pageFieldNames).to.have.length(EXPECTED_LAST_PAGE_COUNT);
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 6a245d3ea192a..99fb3dbf13493 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -18,7 +18,6 @@ export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const remote = getService('remote');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'header', 'settings', 'visualize', 'discover']);
 
   describe('scripted fields', () => {
@@ -103,7 +102,6 @@ export default function ({ getService, getPageObjects }) {
         await log.debug('getDataTableData = ' + data.split('\n'));
         await log.debug('data=' + data);
         await log.debug('data.length=' + data.length);
-        await screenshots.take('Visualize-vertical-bar-chart');
         expect(data.trim().split('\n')).to.eql(expectedChartValues);
       });
     });
@@ -170,7 +168,6 @@ export default function ({ getService, getPageObjects }) {
         await log.debug('getDataTableData = ' + data.split('\n'));
         await log.debug('data=' + data);
         await log.debug('data.length=' + data.length);
-        await screenshots.take('Visualize-vertical-bar-chart');
         expect(data.trim().split('\n')).to.eql(expectedChartValues);
       });
     });
diff --git a/test/functional/apps/status_page/index.js b/test/functional/apps/status_page/index.js
index 25afb2a977ded..a14c2700ad61c 100644
--- a/test/functional/apps/status_page/index.js
+++ b/test/functional/apps/status_page/index.js
@@ -2,7 +2,6 @@ import expect from 'expect.js';
 
 export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['common']);
 
@@ -14,7 +13,6 @@ export default function ({ getService, getPageObjects }) {
     it('should show the kibana plugin as ready', async function () {
       await retry.tryForTime(6000, async () => {
         const text = await testSubjects.getVisibleText('statusBreakdown');
-        screenshots.take('Status');
         expect(text.indexOf('plugin:kibana')).to.be.above(-1);
       });
     });
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index fa878130d1bc6..6eb9854ada12a 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings']);
 
   describe('visualize app', function describeIndexTests() {
@@ -86,7 +85,6 @@ export default function ({ getService, getPageObjects }) {
         return PageObjects.visualize.saveVisualization(vizName1)
         .then(function (message) {
           log.debug('Saved viz message = ' + message);
-          screenshots.take('Visualize-area-chart-save-toast');
           expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
         })
         .then(function testVisualizeWaitForToastMessageGone() {
@@ -135,7 +133,6 @@ export default function ({ getService, getPageObjects }) {
         .then(function (paths) {
           log.debug('expectedAreaChartData = ' + expectedAreaChartData);
           log.debug('actual chart data =     ' + paths);
-          screenshots.take('Visualize-area-chart');
           expect(paths).to.eql(expectedAreaChartData);
         });
       });
diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js
index aa0230adb0552..c60c24a3ab81d 100644
--- a/test/functional/apps/visualize/_chart_types.js
+++ b/test/functional/apps/visualize/_chart_types.js
@@ -2,7 +2,6 @@ import expect from 'expect.js';
 
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize']);
 
   describe('visualize app', function describeIndexTests() {
@@ -40,7 +39,6 @@ export default function ({ getService, getPageObjects }) {
         .then(function testChartTypes(chartTypes) {
           log.debug('returned chart types = ' + chartTypes);
           log.debug('expected chart types = ' + expectedChartTypes);
-          screenshots.take('Visualize-chart-types');
           expect(chartTypes).to.eql(expectedChartTypes);
         });
       });
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index 6445817b19de7..ef635bf138ca0 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
   describe('visualize app', function describeIndexTests() {
@@ -79,7 +78,6 @@ export default function ({ getService, getPageObjects }) {
           return PageObjects.visualize.getDataTableData()
           .then(function showData(data) {
             log.debug(data.split('\n'));
-            screenshots.take('Visualize-data-table');
             expect(data.split('\n')).to.eql(expectedChartData);
           });
         });
diff --git a/test/functional/apps/visualize/_gauge_chart.js b/test/functional/apps/visualize/_gauge_chart.js
index 364edaa552db0..48a9d701c6cad 100644
--- a/test/functional/apps/visualize/_gauge_chart.js
+++ b/test/functional/apps/visualize/_gauge_chart.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
   describe('visualize app', function describeIndexTests() {
@@ -35,7 +34,6 @@ export default function ({ getService, getPageObjects }) {
         return retry.try(function tryingForTime() {
           return PageObjects.visualize.getGaugeValue()
           .then(function (metricValue) {
-            screenshots.take('Visualize-gauge-chart');
             expect(expectedCount).to.eql(metricValue[0].split('\n'));
           });
         });
diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js
index c3315ecaa14b1..a89a418facb26 100644
--- a/test/functional/apps/visualize/_heatmap_chart.js
+++ b/test/functional/apps/visualize/_heatmap_chart.js
@@ -2,7 +2,6 @@ import expect from 'expect.js';
 
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
-  const screenshots = getService('screenshots');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
@@ -81,7 +80,6 @@ export default function ({ getService, getPageObjects }) {
           const data = await PageObjects.visualize.getHeatmapData();
           log.debug('data=' + data);
           log.debug('data.length=' + data.length);
-          screenshots.take('Visualize-heatmap-chart');
           expect(data).to.eql(expectedChartValues);
         });
       });
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index 6669764c6fdff..9e14347463f5c 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
   describe('visualize app', function describeIndexTests() {
@@ -63,7 +62,6 @@ export default function ({ getService, getPageObjects }) {
           return PageObjects.visualize.getLineChartData('fill="#00a69b"')
           .then(function showData(data) {
             log.debug('data=' + data);
-            screenshots.take('Visualize-line-chart');
             const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
             for (let x = 0; x < data.length; x++) {
               log.debug('x=' + x + ' expectedChartData[x].split(\' \')[1] = ' +
@@ -93,7 +91,6 @@ export default function ({ getService, getPageObjects }) {
             return PageObjects.visualize.getLineChartData('fill="#00a69b"')
             .then(function showData(data) {
               log.debug('data=' + data);
-              screenshots.take('Visualize-line-chart');
               const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
               for (let x = 0; x < data.length; x++) {
                 log.debug('x=' + x + ' expectedChartData[x].split(\' \')[1] = ' +
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
index a0c2950ef8a62..2b6e01d719490 100644
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -2,7 +2,6 @@ import expect from 'expect.js';
 
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings']);
 
   describe('visualize app', function describeIndexTests() {
@@ -85,7 +84,6 @@ export default function ({ getService, getPageObjects }) {
         return PageObjects.visualize.getPieChartData()
         .then(function (pieData) {
           log.debug('pieData.length = ' + pieData.length);
-          screenshots.take('Visualize-pie-chart');
           expect(pieData.length).to.be(expectedPieChartSliceCount);
         });
       });
diff --git a/test/functional/apps/visualize/_point_series_options.js b/test/functional/apps/visualize/_point_series_options.js
index b26a30caabdc4..ef4fb28c6b25e 100644
--- a/test/functional/apps/visualize/_point_series_options.js
+++ b/test/functional/apps/visualize/_point_series_options.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header', 'pointSeries']);
   const pointSeriesVis = PageObjects.pointSeries;
 
@@ -97,7 +96,6 @@ export default function ({ getService, getPageObjects }) {
           const data = await PageObjects.visualize.getLineChartData('fill="#00a69b"');
           log.debug('count data=' + data);
           log.debug('data.length=' + data.length);
-          screenshots.take('Visualize-secondary-value-axis');
           expect(data).to.eql(expectedChartValues[0]);
 
           const avgMemoryData = await PageObjects.visualize.getLineChartData('fill="#57c17b"', 'ValueAxis-2');
diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index 935d674d04f10..03382a35f8a6f 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings']);
 
   describe('tile map visualize app', function describeIndexTests() {
@@ -121,7 +120,6 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visualize.zoomAllTheWayOut();
         const enabled = await PageObjects.visualize.getMapZoomOutEnabled();
         expect(enabled).to.be(false);
-        screenshots.take('map-at-zoom-0');
       });
 
       // See https://github.com/elastic/kibana/issues/13137 if this test starts failing intermittently
@@ -144,7 +142,6 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.visualize.selectTableInSpyPaneSelect();
         const data = await PageObjects.visualize.getDataTableData();
         await compareTableData(expectedPrecision2DataTable, data.trim().split('\n'));
-        screenshots.take('map-at-zoom-3');
         await PageObjects.visualize.closeSpyPanel();
       });
 
@@ -242,8 +239,6 @@ export default function ({ getService, getPageObjects }) {
         compareTableData(expectedZoom5Data, actualReOpenedZoom5Data.trim().split('\n'));
 
         await PageObjects.visualize.closeSpyPanel();
-
-        await screenshots.take('Visualize-site-map');
       });
 
       it('should zoom in to level 10', function () {
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
index 5fbe56c81b857..123a0dc274bac 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -3,7 +3,6 @@ import expect from 'expect.js';
 export default function ({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const screenshots = getService('screenshots');
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
   describe('visualize app', function describeIndexTests() {
@@ -83,7 +82,6 @@ export default function ({ getService, getPageObjects }) {
           const data = await PageObjects.visualize.getBarChartData();
           log.debug('data=' + data);
           log.debug('data.length=' + data.length);
-          screenshots.take('Visualize-vertical-bar-chart');
           expect(data).to.eql(expectedChartValues);
         });
       });
diff --git a/test/functional/screenshots/.empty b/test/functional/screenshots/.empty
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/test/functional/screenshots/baseline/Console-default-request.png b/test/functional/screenshots/baseline/Console-default-request.png
deleted file mode 100644
index cdaf7f8202fba..0000000000000
Binary files a/test/functional/screenshots/baseline/Console-default-request.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Console-help-collapsed.png b/test/functional/screenshots/baseline/Console-help-collapsed.png
deleted file mode 100644
index b7b7649b39bee..0000000000000
Binary files a/test/functional/screenshots/baseline/Console-help-collapsed.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Console-help-expanded.png b/test/functional/screenshots/baseline/Console-help-expanded.png
deleted file mode 100644
index 4de6cc1c58385..0000000000000
Binary files a/test/functional/screenshots/baseline/Console-help-expanded.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Dashboard-add-visualizations.png b/test/functional/screenshots/baseline/Dashboard-add-visualizations.png
deleted file mode 100644
index 7255b54da2a91..0000000000000
Binary files a/test/functional/screenshots/baseline/Dashboard-add-visualizations.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Dashboard-has-visualizations.png b/test/functional/screenshots/baseline/Dashboard-has-visualizations.png
deleted file mode 100644
index 3f0e18b52a2cf..0000000000000
Binary files a/test/functional/screenshots/baseline/Dashboard-has-visualizations.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Dashboard-load-saved.png b/test/functional/screenshots/baseline/Dashboard-load-saved.png
deleted file mode 100644
index 9aff82b17a528..0000000000000
Binary files a/test/functional/screenshots/baseline/Dashboard-load-saved.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Dashboard-no-visualizations.png b/test/functional/screenshots/baseline/Dashboard-no-visualizations.png
deleted file mode 100644
index 3daa6682a0b87..0000000000000
Binary files a/test/functional/screenshots/baseline/Dashboard-no-visualizations.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Dashboard-set-timepicker.png b/test/functional/screenshots/baseline/Dashboard-set-timepicker.png
deleted file mode 100644
index 60f4434a7f9f4..0000000000000
Binary files a/test/functional/screenshots/baseline/Dashboard-set-timepicker.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Dashboard-visualization-sizes.png b/test/functional/screenshots/baseline/Dashboard-visualization-sizes.png
deleted file mode 100644
index 77af5a1f2c14c..0000000000000
Binary files a/test/functional/screenshots/baseline/Dashboard-visualization-sizes.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-copy-to-clipboard-toast.png b/test/functional/screenshots/baseline/Discover-copy-to-clipboard-toast.png
deleted file mode 100644
index 1b4ce74c0c88e..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-copy-to-clipboard-toast.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-field-data.png b/test/functional/screenshots/baseline/Discover-field-data.png
deleted file mode 100644
index a67dd1f948f9b..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-field-data.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-load-query.png b/test/functional/screenshots/baseline/Discover-load-query.png
deleted file mode 100644
index 0a81623880ff2..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-load-query.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-no-results.png b/test/functional/screenshots/baseline/Discover-no-results.png
deleted file mode 100644
index 087fc38e26f39..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-no-results.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-save-query-toast.png b/test/functional/screenshots/baseline/Discover-save-query-toast.png
deleted file mode 100644
index af51accf12bbd..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-save-query-toast.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-share-link.png b/test/functional/screenshots/baseline/Discover-share-link.png
deleted file mode 100644
index 4d4517db52cab..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-share-link.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-shorten-url-button.png b/test/functional/screenshots/baseline/Discover-shorten-url-button.png
deleted file mode 100644
index d2e630e9646d9..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-shorten-url-button.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-sidebar-collapsed.png b/test/functional/screenshots/baseline/Discover-sidebar-collapsed.png
deleted file mode 100644
index 5e49a212f37d1..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-sidebar-collapsed.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-sidebar-expanded.png b/test/functional/screenshots/baseline/Discover-sidebar-expanded.png
deleted file mode 100644
index f755d632aa50e..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-sidebar-expanded.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-sort-down.png b/test/functional/screenshots/baseline/Discover-sort-down.png
deleted file mode 100644
index 835389854b914..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-sort-down.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Discover-syntax-error-toast.png b/test/functional/screenshots/baseline/Discover-syntax-error-toast.png
deleted file mode 100644
index 0456e7a7ce078..0000000000000
Binary files a/test/functional/screenshots/baseline/Discover-syntax-error-toast.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-advanced-tab.png b/test/functional/screenshots/baseline/Settings-advanced-tab.png
deleted file mode 100644
index 9d3cf76c72c18..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-advanced-tab.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-column-name-sort-ascending.png b/test/functional/screenshots/baseline/Settings-indices-column-name-sort-ascending.png
deleted file mode 100644
index 4dd2e3b420496..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-column-name-sort-ascending.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-column-name-sort-descending.png b/test/functional/screenshots/baseline/Settings-indices-column-name-sort-descending.png
deleted file mode 100644
index 2f992bbecccf7..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-column-name-sort-descending.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-column-type-sort-ascending.png b/test/functional/screenshots/baseline/Settings-indices-column-type-sort-ascending.png
deleted file mode 100644
index dbddbfed35688..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-column-type-sort-ascending.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-column-type-sort-descending.png b/test/functional/screenshots/baseline/Settings-indices-column-type-sort-descending.png
deleted file mode 100644
index 266f0fc92df32..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-column-type-sort-descending.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-confirm-remove-index-pattern.png b/test/functional/screenshots/baseline/Settings-indices-confirm-remove-index-pattern.png
deleted file mode 100644
index f27eb7ed00b18..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-confirm-remove-index-pattern.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-enable-creation.png b/test/functional/screenshots/baseline/Settings-indices-enable-creation.png
deleted file mode 100644
index b6f1bd8ba2e99..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-enable-creation.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-new-index-pattern.png b/test/functional/screenshots/baseline/Settings-indices-new-index-pattern.png
deleted file mode 100644
index 76c41c91676d4..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-new-index-pattern.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-paged.png b/test/functional/screenshots/baseline/Settings-indices-paged.png
deleted file mode 100644
index 7e72d34e43660..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-paged.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-result-popularity-saved.png b/test/functional/screenshots/baseline/Settings-indices-result-popularity-saved.png
deleted file mode 100644
index 7fda78f64e8e3..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-result-popularity-saved.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-indices-result-popularity-updated.png b/test/functional/screenshots/baseline/Settings-indices-result-popularity-updated.png
deleted file mode 100644
index 7d29ab2970734..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-indices-result-popularity-updated.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-initial-state.png b/test/functional/screenshots/baseline/Settings-initial-state.png
deleted file mode 100644
index f27eb7ed00b18..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-initial-state.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Settings-set-timezone.png b/test/functional/screenshots/baseline/Settings-set-timezone.png
deleted file mode 100644
index cde95b470e09e..0000000000000
Binary files a/test/functional/screenshots/baseline/Settings-set-timezone.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Status.png b/test/functional/screenshots/baseline/Status.png
deleted file mode 100644
index 8c3ad8d3a9154..0000000000000
Binary files a/test/functional/screenshots/baseline/Status.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-area-chart-save-toast.png b/test/functional/screenshots/baseline/Visualize-area-chart-save-toast.png
deleted file mode 100644
index 9cacf128de06b..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-area-chart-save-toast.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-area-chart.png b/test/functional/screenshots/baseline/Visualize-area-chart.png
deleted file mode 100644
index 8be0c7b0a570f..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-area-chart.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-chart-types.png b/test/functional/screenshots/baseline/Visualize-chart-types.png
deleted file mode 100644
index 705598645c331..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-chart-types.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-data-table.png b/test/functional/screenshots/baseline/Visualize-data-table.png
deleted file mode 100644
index c696723d35d6f..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-data-table.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-line-chart.png b/test/functional/screenshots/baseline/Visualize-line-chart.png
deleted file mode 100644
index 88ee84a52db88..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-line-chart.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-metric-chart.png b/test/functional/screenshots/baseline/Visualize-metric-chart.png
deleted file mode 100644
index 1c92e816a3bc6..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-metric-chart.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-pie-chart.png b/test/functional/screenshots/baseline/Visualize-pie-chart.png
deleted file mode 100644
index 857e4fb19bd29..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-pie-chart.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-site-map.png b/test/functional/screenshots/baseline/Visualize-site-map.png
deleted file mode 100644
index d4b6838b25a4f..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-site-map.png and /dev/null differ
diff --git a/test/functional/screenshots/baseline/Visualize-vertical-bar-chart.png b/test/functional/screenshots/baseline/Visualize-vertical-bar-chart.png
deleted file mode 100644
index 3c9e9610cbcbc..0000000000000
Binary files a/test/functional/screenshots/baseline/Visualize-vertical-bar-chart.png and /dev/null differ