diff --git a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
index bee97d61a2..7d79a1a445 100644
--- a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
+++ b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
@@ -143,14 +143,6 @@ export default class ResultSet extends React.PureComponent {
   }
   render() {
     const query = this.props.query;
-    const results = query.results;
-    let data;
-    if (this.props.cache && query.cached) {
-      data = this.state.data;
-    } else {
-      data = results ? results.data : [];
-    }
-
     let sql;
 
     if (query.state === 'stopped') {
@@ -194,7 +186,14 @@ export default class ResultSet extends React.PureComponent {
           </Alert>
         </div>);
     } else if (query.state === 'success') {
-      if (results && data && data.length > 0) {
+      const results = query.results;
+      let data;
+      if (this.props.cache && query.cached) {
+        data = this.state.data;
+      } else {
+        data = results ? results.data : [];
+      }
+      if (results && data.length > 0) {
         return (
           <div>
             <VisualizeModal
diff --git a/superset/assets/spec/javascripts/sqllab/ResultSet_spec.jsx b/superset/assets/spec/javascripts/sqllab/ResultSet_spec.jsx
index 7e5cd15c77..ab79f2981f 100644
--- a/superset/assets/spec/javascripts/sqllab/ResultSet_spec.jsx
+++ b/superset/assets/spec/javascripts/sqllab/ResultSet_spec.jsx
@@ -2,15 +2,45 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
+import sinon from 'sinon';
+
+import { Alert, ProgressBar, Button } from 'react-bootstrap';
 import FilterableTable from '../../../javascripts/components/FilterableTable/FilterableTable';
+import VisualizeModal from '../../../javascripts/SqlLab/components/VisualizeModal';
 import ResultSet from '../../../javascripts/SqlLab/components/ResultSet';
-import { queries } from './fixtures';
+import { queries, stoppedQuery, runningQuery, cachedQuery } from './fixtures';
 
 describe('ResultSet', () => {
+  const clearQuerySpy = sinon.spy();
+  const fetchQuerySpy = sinon.spy();
   const mockedProps = {
+    actions: {
+      clearQueryResults: clearQuerySpy,
+      fetchQueryResults: fetchQuerySpy,
+    },
+    cache: true,
     query: queries[0],
     height: 0,
   };
+  const stoppedQueryProps = Object.assign({}, mockedProps, {
+    query: stoppedQuery,
+  });
+  const runningQueryProps = Object.assign({}, mockedProps, {
+    query: runningQuery,
+  });
+  const cachedQueryProps = Object.assign({}, mockedProps, {
+    query: cachedQuery,
+  });
+  const newProps = {
+    query: {
+      cached: false,
+      resultsKey: 'new key',
+      results: {
+        data: [{ a: 1 }],
+      },
+    },
+  };
+
   it('is valid', () => {
     expect(React.isValidElement(<ResultSet {...mockedProps} />)).to.equal(true);
   });
@@ -18,4 +48,76 @@ describe('ResultSet', () => {
     const wrapper = shallow(<ResultSet {...mockedProps} />);
     expect(wrapper.find(FilterableTable)).to.have.length(1);
   });
+  describe('getControls', () => {
+    it('should render controls', () => {
+      const wrapper = shallow(<ResultSet {...mockedProps} />);
+      wrapper.instance().getControls();
+      expect(wrapper.find(Button)).to.have.length(2);
+      expect(wrapper.find('input').props().placeholder).to.equal('Search Results');
+    });
+    it('should handle no controls', () => {
+      const wrapper = shallow(<ResultSet {...mockedProps} />);
+      wrapper.setProps({ search: false, visualize: false, csv: false });
+      const controls = wrapper.instance().getControls();
+      expect(controls.props.className).to.equal('noControls');
+    });
+  });
+  describe('componentWillReceiveProps', () => {
+    const wrapper = shallow(<ResultSet {...mockedProps} />);
+    let spy;
+    beforeEach(() => {
+      clearQuerySpy.reset();
+      fetchQuerySpy.reset();
+      spy = sinon.spy(ResultSet.prototype, 'componentWillReceiveProps');
+    });
+    afterEach(() => {
+      spy.restore();
+    });
+    it('should update cached data', () => {
+      wrapper.setProps(newProps);
+
+      expect(wrapper.state().data).to.deep.equal(newProps.query.results.data);
+      expect(clearQuerySpy.callCount).to.equal(1);
+      expect(clearQuerySpy.getCall(0).args[0]).to.deep.equal(newProps.query);
+      expect(fetchQuerySpy.callCount).to.equal(1);
+      expect(fetchQuerySpy.getCall(0).args[0]).to.deep.equal(newProps.query);
+    });
+  });
+  describe('render', () => {
+    it('should render success query', () => {
+      const wrapper = shallow(<ResultSet {...mockedProps} />);
+      const filterableTable = wrapper.find(FilterableTable);
+      expect(filterableTable.props().data).to.equal(mockedProps.query.results.data);
+      expect(wrapper.find(VisualizeModal)).to.have.length(1);
+    });
+    it('should render empty results', () => {
+      const wrapper = shallow(<ResultSet {...mockedProps} />);
+      const emptyResults = Object.assign({}, queries[0], {
+        results: {
+          data: [],
+        },
+      });
+      wrapper.setProps({ query: emptyResults });
+      expect(wrapper.find(FilterableTable)).to.have.length(0);
+      expect(wrapper.find(Alert)).to.have.length(1);
+      expect(wrapper.find(Alert).shallow().text()).to.equal('The query returned no data');
+    });
+    it('should render cached query', () => {
+      const wrapper = shallow(<ResultSet {...cachedQueryProps} />);
+      const cachedData = [
+        { col1: 'a', col2: 'b' },
+      ];
+      wrapper.setState({ data: cachedData });
+      const filterableTable = wrapper.find(FilterableTable);
+      expect(filterableTable.props().data).to.equal(cachedData);
+    });
+    it('should render stopped query', () => {
+      const wrapper = shallow(<ResultSet {...stoppedQueryProps} />);
+      expect(wrapper.find(Alert)).to.have.length(1);
+    });
+    it('should render running/pending/fetching query', () => {
+      const wrapper = shallow(<ResultSet {...runningQueryProps} />);
+      expect(wrapper.find(ProgressBar)).to.have.length(1);
+    });
+  });
 });
diff --git a/superset/assets/spec/javascripts/sqllab/fixtures.js b/superset/assets/spec/javascripts/sqllab/fixtures.js
index db638ba3c1..c6654dc607 100644
--- a/superset/assets/spec/javascripts/sqllab/fixtures.js
+++ b/superset/assets/spec/javascripts/sqllab/fixtures.js
@@ -258,6 +258,32 @@ export const queries = [
   },
 ];
 
+export const stoppedQuery = {
+  dbId: 1,
+  cached: false,
+  ctas: false,
+  id: 'ryhMUZCGb',
+  progress: 0,
+  results: [],
+  runAsync: false,
+  schema: 'main',
+  sql: 'SELECT ...',
+  sqlEditorId: 'rJaf5u9WZ',
+  startDttm: 1497400851936,
+  state: 'stopped',
+  tab: 'Untitled Query 2',
+  tempTableName: '',
+};
+export const runningQuery = {
+  dbId: 1,
+  cached: false,
+  ctas: false,
+  id: 'ryhMUZCGb',
+  progress: 90,
+  state: 'running',
+};
+export const cachedQuery = Object.assign({}, queries[0], { cached: true });
+
 export const initialState = {
   alerts: [],
   queries: {},