diff --git a/scm-ui/ui-tests/enzyme.js b/scm-ui/ui-tests/enzyme.js
index dd538876a4..874f629fff 100644
--- a/scm-ui/ui-tests/enzyme.js
+++ b/scm-ui/ui-tests/enzyme.js
@@ -1,5 +1,5 @@
 import "raf/polyfill";
-import { configure } from "enzyme";
+import Enzyme from "enzyme";
 import Adapter from "enzyme-adapter-react-16";
 
 // Temporary hack to suppress error
@@ -9,4 +9,4 @@ window.requestAnimationFrame = function(callback) {
   return 0;
 };
 
-configure({ adapter: new Adapter() });
+Enzyme.configure({ adapter: new Adapter() });
diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json
index 6061d078f6..a540f4e668 100644
--- a/scm-ui/ui-tests/package.json
+++ b/scm-ui/ui-tests/package.json
@@ -7,6 +7,7 @@
   "private": false,
   "dependencies": {
     "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.15.0",
     "enzyme-context": "^1.1.2",
     "enzyme-context-react-router-4": "^2.0.0",
     "jest": "^24.9.0",
diff --git a/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.js b/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.js
index 286b99fc05..8f326014c7 100644
--- a/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.js
+++ b/scm-ui/ui-webapp/src/repos/components/PermissionsNavLink.test.js
@@ -1,11 +1,11 @@
+// @flow
 import React from "react";
 import {mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
+import "@scm-manager/ui-tests/enzyme";
 import "@scm-manager/ui-tests/i18n";
-import ReactRouterEnzymeContext from "react-router-enzyme-context";
 import PermissionsNavLink from "./PermissionsNavLink";
 
 describe("PermissionsNavLink", () => {
-  const options = new ReactRouterEnzymeContext();
 
   it("should render nothing, if the modify link is missing", () => {
     const repository = {
@@ -13,8 +13,7 @@ describe("PermissionsNavLink", () => {
     };
 
     const navLink = shallow(
-      <PermissionsNavLink repository={repository} permissionUrl="" />,
-      options.get()
+      <PermissionsNavLink repository={repository} permissionUrl="" />
     );
     expect(navLink.text()).toBe("");
   });
@@ -29,8 +28,7 @@ describe("PermissionsNavLink", () => {
     };
 
     const navLink = mount(
-      <PermissionsNavLink repository={repository} permissionUrl="" />,
-      options.get()
+      <PermissionsNavLink repository={repository} permissionUrl="" />
     );
     expect(navLink.text()).toBe("repositoryRoot.menu.permissionsNavLink");
   });
diff --git a/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.js b/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.js
index bdaf296874..2d911e783b 100644
--- a/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.js
+++ b/scm-ui/ui-webapp/src/repos/components/RepositoryNavLink.test.js
@@ -1,9 +1,7 @@
 // @flow
 import React from "react";
 import { shallow, mount } from "@scm-manager/ui-tests/enzyme-router";
-import "@scm-manager/ui-tests/enzyme";
 import "@scm-manager/ui-tests/i18n";
-
 import RepositoryNavLink from "./RepositoryNavLink";
 
 describe("RepositoryNavLink", () => {
diff --git a/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.js b/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.js
index f0d44a2606..85860cba8c 100644
--- a/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.js
+++ b/scm-ui/ui-webapp/src/users/components/navLinks/SetPermissionsNavLink.test.js
@@ -1,8 +1,8 @@
 import React from "react";
-import { shallow } from "enzyme";
 import "@scm-manager/ui-tests/enzyme";
 import "@scm-manager/ui-tests/i18n";
 import SetPermissionsNavLink from "./SetPermissionsNavLink";
+import { shallow } from "enzyme";
 
 it("should render nothing, if the permissions link is missing", () => {
   const user = {