diff --git a/src/components/SortableTable.js b/src/components/SortableTable.js
index a851275b5..a397b4118 100644
--- a/src/components/SortableTable.js
+++ b/src/components/SortableTable.js
@@ -48,9 +48,9 @@ class SortableTable extends React.Component {
       <tr key={row.key} className={rowClassName(row)} onClick={() => rowOnClick(row)}>
         {columns.map(column => <td key={column.key} className={generateColumnClassName(column)}>{column.cell(row)}</td>)}
       </tr>,
-      expanded && <tr hidden />,
+      expanded && <tr key={row.key ? `${row.key}-hidden` : null} hidden />,
       expanded && (
-        <tr className="tr-expanded">
+        <tr key={row.key ? `${row.key}-expanded` : null} className="tr-expanded">
           <td className="border-top-0" colSpan={columns.length}>
             {expanded}
           </td>
diff --git a/test/components/SortableTable.spec.js b/test/components/SortableTable.spec.js
index 55f8ef447..0873e16f8 100644
--- a/test/components/SortableTable.spec.js
+++ b/test/components/SortableTable.spec.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import assert from 'assert';
 import sinon from 'sinon';
-import { mount } from 'enzyme';
+import { mount, shallow } from 'enzyme';
 
 import { SortableTable } from '../../src';
 
@@ -197,7 +197,7 @@ describe('<SortableTable />', () => {
   it('should render expandable row when specified', () => {
     const columns = [{ header: 'Name', cell: row => row }];
     const rows = ['Alpha', 'Bravo', 'Charlie', 'Delta'];
-    const wrapper = mount(
+    const wrapper = shallow(
       <SortableTable
         columns={columns}
         rows={rows}