diff --git a/frontend/test/components/subview.spec.jsx b/frontend/test/components/subview.spec.jsx
new file mode 100644
index 0000000..095a261
--- /dev/null
+++ b/frontend/test/components/subview.spec.jsx
@@ -0,0 +1,154 @@
+import { configure, mount } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { SubViewComponent } from '../../ui/subview';
+
+configure({ adapter: new Adapter() });
+
+const resolvePromise = Promise.resolve({});
+const sampleMeasure = {
+  versions: [
+    {
+      version: '63.0.3',
+      fieldDuration: 156000,
+      count: 2280274,
+      rate: 1.75,
+      adjustedCount: 2280274,
+      adjustedRate: 1.75,
+    },
+    {
+      version: '63.0.1',
+      fieldDuration: 1408500,
+      count: 15773585,
+      rate: 1.25,
+      adjustedCount: 15773585,
+      adjustedRate: 1.25,
+    },
+    {
+      version: '63.0',
+      fieldDuration: 954000,
+      count: 7133231,
+      rate: 1.56,
+      adjustedCount: 7133231,
+      adjustedRate: 1.56,
+    },
+    {
+      version: '63',
+      fieldDuration: 2518500,
+      count: 26432214,
+      rate: 1.25,
+      adjustedCount: 26432214,
+      adjustedRate: 1.25,
+    },
+    {
+      version: '62',
+      fieldDuration: 4148100,
+      count: 30932336,
+      rate: 1.08,
+      adjustedCount: 17006151,
+      adjustedRate: 1.13,
+    },
+    {
+      version: '61',
+      fieldDuration: 6100800,
+      count: 112777330,
+      rate: 1.17,
+      adjustedCount: 39355015,
+      adjustedRate: 1.32,
+    },
+    {
+      version: '60',
+      fieldDuration: 4160100,
+      count: 27772666,
+      rate: 1.13,
+      adjustedCount: 14980209,
+      adjustedRate: 1.19,
+    },
+  ],
+  lastUpdated: '2018-11-20T15:00:00Z',
+};
+const componentProps = {
+  match: {
+    path: '/:channel/:platform',
+    url: '/release/android',
+    isExact: true,
+    params: {
+      platform: 'windows',
+      channel: 'nightly',
+    },
+  },
+  location: {
+    pathname: '/release/android',
+    search: '',
+    hash: '',
+  },
+  history: {
+    length: 3,
+    action: 'PUSH',
+    location: {},
+    createHref: {},
+    push: {},
+    replace: {},
+    go: {},
+    goBack: {},
+    goForward: {},
+    block: {},
+    listen: {},
+  },
+  exact: true,
+  path: '/:channel/:platform',
+  fetchChannelPlatformSummaryData: () => resolvePromise,
+  versions: ['63.0.2', '63.0', '63', '62', '61', '60'],
+  latestReleaseAge: 1650600,
+  dispatch: '[function ]',
+};
+
+describe('SubView', () => {
+  it('should render only crashMeasures table when otherMeasures is empty', () => {
+    const mainMeasures = [
+      {
+        ...sampleMeasure,
+        name: 'startup_crashes',
+      },
+    ];
+    const subViewComponentProps = {
+      ...componentProps,
+      measures: mainMeasures,
+    };
+    const component = mount(
+      <Router>
+        <SubViewComponent {...subViewComponentProps} />
+      </Router>
+    );
+
+    return Promise.resolve(component)
+      .then(() => component.update())
+      .then(() => {
+        expect(component.find('h3').text()).toBe('Crash Measures');
+      });
+  });
+
+  it('should render only otherMeasures table when crashMeasures is empty', () => {
+    const otherMeasures = [
+      {
+        ...sampleMeasure,
+        name: 'browser_shim_usage_blocked',
+      },
+    ];
+    const subViewComponentProps = {
+      ...componentProps,
+      measures: otherMeasures,
+    };
+    const component = mount(
+      <Router>
+        <SubViewComponent {...subViewComponentProps} />
+      </Router>
+    );
+
+    return Promise.resolve(component)
+      .then(() => component.update())
+      .then(() => {
+        expect(component.find('h3').text()).toBe('Other Measures');
+      });
+  });
+});
diff --git a/frontend/ui/subview.jsx b/frontend/ui/subview.jsx
index b7c9e49..9537c4f 100644
--- a/frontend/ui/subview.jsx
+++ b/frontend/ui/subview.jsx
@@ -163,18 +163,22 @@ export class SubViewComponent extends React.Component {
                   </p>
                 </center>
               </div>
-              <MeasureTable
-                title="Crash Measures"
-                measures={this.state.measures.crashMeasures}
-                versions={this.props.versions}
-                subviewState={this.state}
-              />
-              <MeasureTable
-                title="Other Measures"
-                measures={this.state.measures.otherMeasures}
-                versions={this.props.versions}
-                subviewState={this.state}
-              />
+              {this.state.measures.crashMeasures.length > 0 && (
+                <MeasureTable
+                  title="Crash Measures"
+                  measures={this.state.measures.crashMeasures}
+                  versions={this.props.versions}
+                  subviewState={this.state}
+                />
+              )}
+              {this.state.measures.otherMeasures.length > 0 && (
+                <MeasureTable
+                  title="Other Measures"
+                  measures={this.state.measures.otherMeasures}
+                  versions={this.props.versions}
+                  subviewState={this.state}
+                />
+              )}
               {this.props.latestReleaseAge &&
                 this.props.latestReleaseAge < 86400 && (
                   <p className="text-danger">
diff --git a/package.json b/package.json
index 8b3aa81..5a3626d 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,7 @@
     "@neutrinojs/jest": "^8.3.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
-    "eslint-plugin-react": "^7.1.0",
-    "react-addons-test-utils": "^15.6.2"
+    "eslint-plugin-react": "^7.1.0"
   },
   "dependencies": {
     "@neutrinojs/env": "^8.2.0",
diff --git a/yarn.lock b/yarn.lock
index a4d1d0f..5a85761 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9080,11 +9080,6 @@ react-addons-css-transition-group@^15.5.2:
   dependencies:
     react-transition-group "^1.2.0"
 
-react-addons-test-utils@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"
-  integrity sha1-wStu/cIkfBDae4dw0YUICnsEcVY=
-
 react-addons-transition-group@^15.5.2:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react-addons-transition-group/-/react-addons-transition-group-15.6.2.tgz#8baebc2ae91ccdbf245fe29c9fd3d36f8b471923"