diff --git a/.jest.js b/.jest.js
index 17e5e08706..4a35146b95 100644
--- a/.jest.js
+++ b/.jest.js
@@ -1,8 +1,7 @@
 const transformIgnorePatterns = [
-  '/dist/',
   // Ignore modules without es dir.
   // Update: @babel/runtime should also be transformed
-  'node_modules/(?!.*@(babel|ant-design))(?!array-move)[^/]+?/(?!(es|node_modules)/)',
+  '/node_modules/(?!array-move|react-dnd|react-dnd-html5-backend|@react-dnd|dnd-core|tween-one|@babel|@ant-design)[^/]+?/(?!(es)/)',
 ];
 
 function getTestRegex(libDir) {
@@ -20,12 +19,6 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'md'],
   modulePathIgnorePatterns: ['/_site/'],
   moduleNameMapper: {
-    '/^dnd-core$/': 'dnd-core/dist/cjs',
-    '/^react-dnd$/': 'react-dnd/dist/cjs',
-    '/^react-dnd-html5-backend$/': 'react-dnd-html5-backend/dist/cjs',
-    '/^react-dnd-touch-backend$/': 'react-dnd-touch-backend/dist/cjs',
-    '/^react-dnd-test-backend$/': 'react-dnd-test-backend/dist/cjs',
-    '/^react-dnd-test-utils$/': 'react-dnd-test-utils/dist/cjs',
     '/\\.(css|less)$/': 'identity-obj-proxy',
   },
   testPathIgnorePatterns: ['/node_modules/', 'dekko', 'node', 'image.test.js', 'image.test.ts'],
diff --git a/package.json b/package.json
index 2438f9fcd0..361469b997 100644
--- a/package.json
+++ b/package.json
@@ -258,8 +258,8 @@
     "react": "^17.0.0",
     "react-color": "^2.17.3",
     "react-copy-to-clipboard": "^5.0.1",
-    "react-dnd": "^15.0.0",
-    "react-dnd-html5-backend": "^15.0.0",
+    "react-dnd": "^16.0.0",
+    "react-dnd-html5-backend": "^16.0.0",
     "react-dom": "^17.0.0",
     "react-draggable": "^4.4.3",
     "react-fast-marquee": "^1.2.1",