diff --git a/package.json b/package.json
index e900b5f95fffd..d9bb2513f7d9d 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "expose-loader": "0.7.3",
     "extract-text-webpack-plugin": "3.0.1",
     "file-loader": "1.1.4",
-    "focus-trap-react": "3.0.3",
+    "focus-trap-react": "3.0.5",
     "font-awesome": "4.4.0",
     "glob": "5.0.13",
     "glob-all": "3.0.1",
@@ -168,7 +168,7 @@
     "raw-loader": "0.5.1",
     "react": "16.0.0",
     "react-ace": "5.2.2",
-    "react-addons-test-utils": "15.6.0",
+    "react-addons-test-utils": "15.6.2",
     "react-anything-sortable": "1.7.3",
     "react-color": "2.11.7",
     "react-dom": "16.0.0",
@@ -183,7 +183,7 @@
     "react-select": "1.0.0-rc.5",
     "react-sizeme": "2.3.4",
     "react-sortable": "1.1.0",
-    "react-test-renderer": "15.6.1",
+    "react-test-renderer": "16.0.0",
     "react-toggle": "4.0.2",
     "reactcss": "1.2.3",
     "redux": "3.7.2",
@@ -228,8 +228,9 @@
     "chokidar": "1.6.0",
     "chromedriver": "2.33.2",
     "classnames": "2.2.5",
-    "enzyme": "2.9.1",
-    "enzyme-to-json": "1.4.5",
+    "enzyme": "3.2.0",
+    "enzyme-adapter-react-16": "1.1.0",
+    "enzyme-to-json": "3.1.4",
     "eslint": "4.10.0",
     "eslint-plugin-babel": "4.1.2",
     "eslint-plugin-import": "2.8.0",
@@ -260,8 +261,8 @@
     "husky": "0.8.1",
     "image-diff": "1.6.0",
     "istanbul-instrumenter-loader": "3.0.0",
-    "jest": "21.0.1",
-    "jest-cli": "21.0.1",
+    "jest": "21.2.1",
+    "jest-cli": "21.2.1",
     "jsdom": "9.9.1",
     "karma": "1.7.0",
     "karma-chrome-launcher": "2.1.1",
diff --git a/src/dev/jest/config.json b/src/dev/jest/config.json
index 5e5c9f52cb10a..f1eb6a82a0129 100644
--- a/src/dev/jest/config.json
+++ b/src/dev/jest/config.json
@@ -24,6 +24,7 @@
   "setupFiles": [
     "<rootDir>/src/dev/jest/setup/babel_polyfill.js",
     "<rootDir>/src/dev/jest/setup/request_animation_frame_polyfill.js"
+    "<rootDir>/src/dev/jest/setup/enzyme.js"
   ],
   "coverageDirectory": "<rootDir>/target/jest-coverage",
   "coverageReporters": [
diff --git a/src/dev/jest/setup/enzyme.js b/src/dev/jest/setup/enzyme.js
new file mode 100644
index 0000000000000..82edfc9e5adea
--- /dev/null
+++ b/src/dev/jest/setup/enzyme.js
@@ -0,0 +1,4 @@
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+configure({ adapter: new Adapter() });