diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index 13d81d603a4e..c913da29f724 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -87,7 +87,7 @@ define(function (require) {
 
       bdd.describe('tile map chart', function indexPatternCreation() {
 
-        bdd.it('should save and load, take screenshot', function pageHeader() {
+        bdd.it('should save and load', function pageHeader() {
           var testSubName = 'TileMap';
           common.debug('Start of test' + testSubName + 'Visualization');
           var vizName1 = 'Visualization ' + testSubName;
@@ -104,17 +104,13 @@ define(function (require) {
           .then(function () {
             return visualizePage.loadSavedVisualization(vizName1);
           })
-          .then(function sleep() {
-            return common.sleep(4000);
-          })
-          .then(function takeScreenshot() {
-            common.debug('Take screenshot');
-            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          .then(function waitForVisualization() {
+            return visualizePage.waitForVisualization();
           })
           .catch(common.handleError(this));
         });
 
-        bdd.it('should show correct tile map data', function pageHeader() {
+        bdd.it('should show correct tile map data, take screenshot', function pageHeader() {
           var testSubName = 'TileMap';
           common.debug('Start of test' + testSubName + 'Visualization');
           // var remote = this.remote;
@@ -137,8 +133,9 @@ define(function (require) {
               expect(data.trim().split('\n')).to.eql(expectedTableData);
             });
           })
-          .then(function () {
-            return visualizePage.collapseChart();
+          .then(function takeScreenshot() {
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
           })
           .catch(common.handleError(this));
         });
diff --git a/test/intern.js b/test/intern.js
index dafcea019f1c..67af1e763229 100644
--- a/test/intern.js
+++ b/test/intern.js
@@ -13,9 +13,9 @@ define(function (require) {
     }],
     tunnelOptions: serverConfig.servers.webdriver,
     functionalSuites: [
-      // 'test/functional/status_page/index',
-      // 'test/functional/apps/settings/index',
-      // 'test/functional/apps/discover/index',
+      'test/functional/status_page/index',
+      'test/functional/apps/settings/index',
+      'test/functional/apps/discover/index',
       'test/functional/apps/visualize/index'
     ],
     excludeInstrumentation: /(fixtures|node_modules)\//,
diff --git a/test/output/.empty b/test/output/.empty
new file mode 100644
index 000000000000..e69de29bb2d1