diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.js
index 12f1b3a9d9..58849de90b 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.js
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/controls.test.js
@@ -32,6 +32,7 @@ describe('Dashboard top-level controls', () => {
     cy.get('#app').then(data => {
       const bootstrapData = JSON.parse(data[0].dataset.bootstrap);
       const dashboard = bootstrapData.dashboard_data;
+      const dashboardId = dashboard.id;
       mapId = dashboard.slices.find(
         slice => slice.form_data.viz_type === 'world_map',
       ).slice_id;
@@ -40,15 +41,16 @@ describe('Dashboard top-level controls', () => {
         const sliceRequest = `getJson_${slice.slice_id}`;
         sliceRequests.push(`@${sliceRequest}`);
         const formData = `{"slice_id":${slice.slice_id}}`;
-        cy.route('POST', `/superset/explore_json/?form_data=${formData}`).as(
-          sliceRequest,
-        );
+        cy.route(
+          'POST',
+          `/superset/explore_json/?form_data=${formData}&dashboard_id=${dashboardId}`,
+        ).as(sliceRequest);
 
         const forceRefresh = `postJson_${slice.slice_id}_force`;
         forceRefreshRequests.push(`@${forceRefresh}`);
         cy.route(
           'POST',
-          `/superset/explore_json/?form_data={"slice_id":${slice.slice_id}}&force=true`,
+          `/superset/explore_json/?form_data={"slice_id":${slice.slice_id}}&force=true&dashboard_id=${dashboardId}`,
         ).as(forceRefresh);
       });
     });
@@ -58,54 +60,52 @@ describe('Dashboard top-level controls', () => {
     forceRefreshRequests.length = 0;
   });
 
-  it.skip('should allow chart level refresh', () => {
+  it('should allow chart level refresh', () => {
     cy.wait(sliceRequests);
-    cy.get('.grid-container .world_map').should('be.exist');
+    cy.get('[data-test="grid-container"]')
+      .find('.world_map')
+      .should('be.exist');
     cy.get(`#slice_${mapId}-controls`).click();
     cy.get(`#slice_${mapId}-controls`)
       .next()
-      .find('.refresh-tooltip')
+      .find('[data-test="dashboard-slice-refresh-tooltip"]')
       .trigger('click', { force: true });
 
     // not allow dashboard level force refresh when any chart is loading
-    cy.get('#save-dash-split-button').trigger('click', { force: true });
-    cy.contains('Force refresh dashboard')
+    cy.get('[data-test="refresh-dashboard-menu-item"]')
       .parent()
       .should('have.class', 'disabled');
     // not allow chart level force refresh when it is loading
     cy.get(`#slice_${mapId}-controls`)
       .next()
-      .find('.refresh-tooltip')
+      .find('[data-test="dashboard-slice-refresh-tooltip"]')
       .parent()
       .parent()
       .should('have.class', 'disabled');
 
     cy.wait(`@postJson_${mapId}_force`);
-    cy.get('#save-dash-split-button').trigger('click');
-    cy.contains('Force refresh dashboard')
+    cy.get('[data-test="refresh-dashboard-menu-item"]')
       .parent()
       .not('have.class', 'disabled');
   });
 
-  it.skip('should allow dashboard level force refresh', () => {
+  it('should allow dashboard level force refresh', () => {
     // when charts are not start loading, for example, under a secondary tab,
     // should allow force refresh
-    cy.get('#save-dash-split-button').trigger('click');
-    cy.contains('Force refresh dashboard')
+    cy.get('[data-test="more-horiz"]').click();
+    cy.get('[data-test="refresh-dashboard-menu-item"]')
       .parent()
       .not('have.class', 'disabled');
 
     // wait the all dash finish loading.
     cy.wait(sliceRequests);
-    cy.get('#save-dash-split-button').trigger('click');
-    cy.contains('Force refresh dashboard').trigger('click', { force: true });
-    cy.get('#save-dash-split-button').trigger('click');
-    cy.contains('Force refresh dashboard')
+    cy.get('[data-test="refresh-dashboard-menu-item"]').click();
+    cy.get('[data-test="refresh-dashboard-menu-item"]')
       .parent()
       .should('have.class', 'disabled');
 
     // wait all charts force refreshed
-    cy.wait(forceRefreshRequests).then(xhrs => {
+    cy.wait(forceRefreshRequests, { responseTimeout: 15000 }).then(xhrs => {
       // is_cached in response should be false
       xhrs.forEach(xhr => {
         readResponseBlob(xhr.response.body).then(responseBody => {
@@ -114,8 +114,8 @@ describe('Dashboard top-level controls', () => {
       });
     });
 
-    cy.get('#save-dash-split-button').trigger('click');
-    cy.contains('Force refresh dashboard')
+    cy.get('[data-test="more-horiz"]').click();
+    cy.get('[data-test="refresh-dashboard-menu-item"]')
       .parent()
       .not('have.class', 'disabled');
   });
diff --git a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
index 0976a18f64..ea666da377 100644
--- a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
+++ b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
@@ -193,7 +193,11 @@ class HeaderActionsDropdown extends React.PureComponent {
           isMenuItem
           triggerNode={<span>{t('Share dashboard')}</span>}
         />
-        <MenuItem onClick={forceRefreshAllCharts} disabled={isLoading}>
+        <MenuItem
+          data-test="refresh-dashboard-menu-item"
+          onClick={forceRefreshAllCharts}
+          disabled={isLoading}
+        >
           {t('Refresh dashboard')}
         </MenuItem>
         <MenuItem divider />
diff --git a/superset-frontend/src/dashboard/components/SliceHeader.jsx b/superset-frontend/src/dashboard/components/SliceHeader.jsx
index 276d36a6dc..9733511a50 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader.jsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader.jsx
@@ -48,6 +48,7 @@ const propTypes = {
   filters: PropTypes.object.isRequired,
   addDangerToast: PropTypes.func.isRequired,
   handleToggleFullSize: PropTypes.func.isRequired,
+  chartStatus: PropTypes.string.isRequired,
 };
 
 const defaultProps = {
@@ -99,6 +100,7 @@ class SliceHeader extends React.PureComponent {
       addDangerToast,
       handleToggleFullSize,
       isFullSize,
+      chartStatus,
     } = this.props;
 
     return (
@@ -153,6 +155,7 @@ class SliceHeader extends React.PureComponent {
               addDangerToast={addDangerToast}
               handleToggleFullSize={handleToggleFullSize}
               isFullSize={isFullSize}
+              chartStatus={chartStatus}
             />
           )}
         </div>
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx b/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx
index a6da5106d0..1778ef5b21 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx
@@ -128,7 +128,6 @@ class SliceHeaderControls extends React.PureComponent {
       ? t('Cached %s', cachedWhen)
       : (updatedWhen && t('Fetched %s', updatedWhen)) || '';
     const resizeLabel = isFullSize ? t('Minimize') : t('Maximize');
-
     return (
       <Dropdown
         id={`slice_${slice.slice_id}-controls`}
@@ -147,7 +146,12 @@ class SliceHeaderControls extends React.PureComponent {
             disabled={this.props.chartStatus === 'loading'}
           >
             {t('Force refresh')}
-            <div className="refresh-tooltip">{refreshTooltip}</div>
+            <div
+              className="refresh-tooltip"
+              data-test="dashboard-slice-refresh-tooltip"
+            >
+              {refreshTooltip}
+            </div>
           </MenuItem>
 
           <MenuItem divider />
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx b/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
index 1313c7718e..aecdbb700a 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Chart.jsx
@@ -301,6 +301,7 @@ class Chart extends React.Component {
           addDangerToast={addDangerToast}
           handleToggleFullSize={handleToggleFullSize}
           isFullSize={isFullSize}
+          chartStatus={chart.chartStatus}
         />
 
         {/*