diff --git a/jest.polyfills.js b/jest.polyfills.js
new file mode 100644
index 00000000..85c00e4d
--- /dev/null
+++ b/jest.polyfills.js
@@ -0,0 +1,3 @@
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/jest.setup.js b/jest.setup.js
index a425ad13..ad260a8a 100644
--- a/jest.setup.js
+++ b/jest.setup.js
@@ -1 +1,7 @@
-Object.defineProperty(window, 'requestAnimationFrame', { value: fn => fn() });
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+configure({
+  adapter: new Adapter(),
+  disableLifecycleMethods: true,
+});