diff --git a/src/components/NamedLink/NamedLink.test.js b/src/components/NamedLink/NamedLink.test.js
index 67a46ad4..2d5d9aa6 100644
--- a/src/components/NamedLink/NamedLink.test.js
+++ b/src/components/NamedLink/NamedLink.test.js
@@ -1,9 +1,7 @@
 import React from 'react';
-import { BrowserRouter } from 'react-router';
 import { RoutesProvider } from '../index';
-import Routes from '../../Routes';
+import { renderDeep } from '../../util/test-helpers';
 import NamedLink from './NamedLink';
-import renderer from 'react-test-renderer';
 
 describe('NamedLink', () => {
   it('should contain correct link', () => {
@@ -11,16 +9,13 @@ describe('NamedLink', () => {
     const routesConf = [
       { pattern: '/somepage/:id', name: 'SomePage', component: () => <div>blaa</div> },
     ];
-    const component = renderer.create(
-      <BrowserRouter>
-        <RoutesProvider routes={routesConf}>
-          <NamedLink name="SomePage" params={{ id }}>to SomePage</NamedLink>
-        </RoutesProvider>
-      </BrowserRouter>,
+    const tree = renderDeep(
+      <RoutesProvider routes={routesConf}>
+        <NamedLink name="SomePage" params={{ id }}>to SomePage</NamedLink>
+      </RoutesProvider>,
     );
-    const json = component.toJSON();
-    expect(json.type).toEqual('a');
-    expect(json.props.href).toEqual(`/somepage/${id}`);
-    expect(json.children).toEqual(['to SomePage']);
+    expect(tree.type).toEqual('a');
+    expect(tree.props.href).toEqual(`/somepage/${id}`);
+    expect(tree.children).toEqual(['to SomePage']);
   });
 });
diff --git a/src/components/RouterProvider/RouterProvider.test.js b/src/components/RouterProvider/RouterProvider.test.js
index 49703700..a03e6fe5 100644
--- a/src/components/RouterProvider/RouterProvider.test.js
+++ b/src/components/RouterProvider/RouterProvider.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
+import { renderDeep } from '../../util/test-helpers';
 import RouterProvider from './RouterProvider';
-import renderer from 'react-test-renderer';
 
 describe('RouterProvider', () => {
   it('should contain routes from context', () => {
@@ -10,9 +10,7 @@ describe('RouterProvider', () => {
     };
     Child.contextTypes = { router: React.PropTypes.object };
 
-    const rendered = renderer
-      .create(<RouterProvider router={router}><Child /></RouterProvider>)
-      .toJSON();
-    expect(rendered.children).toContain('router in context');
+    const tree = renderDeep(<RouterProvider router={router}><Child /></RouterProvider>);
+    expect(tree.children).toContain('router in context');
   });
 });
diff --git a/src/components/RoutesProvider/RoutesProvider.test.js b/src/components/RoutesProvider/RoutesProvider.test.js
index a274af4f..ea936d99 100644
--- a/src/components/RoutesProvider/RoutesProvider.test.js
+++ b/src/components/RoutesProvider/RoutesProvider.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
+import { renderDeep } from '../../util/test-helpers';
 import RoutesProvider from './RoutesProvider';
-import renderer from 'react-test-renderer';
 
 describe('RoutesProvider', () => {
   it('should contain routes from context', () => {
@@ -10,9 +10,7 @@ describe('RoutesProvider', () => {
     };
     Child.contextTypes = { routes: React.PropTypes.array };
 
-    const rendered = renderer
-      .create(<RoutesProvider routes={routesConf}><Child /></RoutesProvider>)
-      .toJSON();
-    expect(rendered.children).toContain('SomePage');
+    const tree = renderDeep(<RoutesProvider routes={routesConf}><Child /></RoutesProvider>);
+    expect(tree.children).toContain('SomePage');
   });
 });