diff --git a/config/setupEnzyme.js b/config/jest/setupEnzyme.js
similarity index 100%
rename from config/setupEnzyme.js
rename to config/jest/setupEnzyme.js
diff --git a/jest.config.js b/jest.config.js
index fe0bbddf..fa9ddbe4 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -15,7 +15,7 @@ module.exports = {
       lines: 85,
     },
   },
-  setupFiles: [ '<rootDir>/config/setupEnzyme.js' ],
+  setupFiles: [ '<rootDir>/config/jest/setupEnzyme.js' ],
   testMatch: [ '<rootDir>/test/**/*.test.{ts,tsx}' ],
   testEnvironment: 'jsdom',
   testURL: 'http://localhost',
diff --git a/package.json b/package.json
index 60fbb91d..798e95b4 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "serve:build": "serve ./build",
     "build": "DISABLE_ESLINT_PLUGIN=true react-scripts build && node scripts/replace-version.js",
     "build:dist": "npm run build && node scripts/create-dist-file.js",
-    "test": "node scripts/test.js --env=jsdom --colors --verbose",
+    "test": "jest --env=jsdom --colors --verbose",
     "test:coverage": "npm run test -- --coverage --coverageReporters=text --coverageReporters=text-summary",
     "test:ci": "npm run test:coverage -- --coverageReporters=clover",
     "test:pretty": "npm run test:coverage -- --coverageReporters=html",
diff --git a/scripts/test.js b/scripts/test.js
deleted file mode 100644
index eb3929c3..00000000
--- a/scripts/test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'test';
-process.env.NODE_ENV = 'test';
-process.env.PUBLIC_URL = '';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', (err) => {
-  throw err;
-});
-
-// Make tests to be matched inside tests folder
-const jest = require('jest');
-
-const argumentsToRemove = 2;
-const argv = process.argv.slice(argumentsToRemove);
-
-jest.run(argv);