diff --git a/.travis.yml b/.travis.yml
index 7bcac68..3d9e235 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,8 @@ install:
 
 script:
     - npm test -- --coverage
-    - node_modules/.bin/eslint -c .eslintrc.js src/ __tests__
-    - node_modules/.bin/prettier 'src/**/*.js' '__tests__/**/*.js' --list-different --single-quote --no-bracket-spacing --trailing-comma all
+    - node_modules/.bin/eslint -c .eslintrc.js src/ tests
+    - node_modules/.bin/prettier 'src/**/*.js' 'tests/**/*.js' --list-different --single-quote --no-bracket-spacing --trailing-comma all
 
 cache:
     directories:
diff --git a/package.json b/package.json
index cebbba1..50dbe55 100644
--- a/package.json
+++ b/package.json
@@ -41,14 +41,17 @@
     "common-bundle": "node_modules/.bin/babel --copy-files --out-dir dist/common src",
     "esm-bundle": "cp -R src dist/esm",
     "cs": "npm run eslint && npm run prettier",
-    "prettier": "node_modules/.bin/prettier '__tests__/**/*.js' 'src/**/*.js' --write --single-quote --no-bracket-spacing --trailing-comma all",
-    "eslint": "node_modules/.bin/eslint src/**/*.js __tests__/**/*.js"
+    "prettier": "node_modules/.bin/prettier 'tests/**/*.js' 'src/**/*.js' --write --single-quote --no-bracket-spacing --trailing-comma all",
+    "eslint": "node_modules/.bin/eslint src/**/*.js tests/**/*.js"
   },
   "files": [
     "dist",
     "CHANGELOG.md",
     "README.md"
   ],
+  "jest": {
+    "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.jsx?$"
+  },
   "babel": {
     "presets": [
       "@babel/preset-react",
diff --git a/__tests__/languageStrategy/defaultUnprefixed.js b/tests/languageStrategy/defaultUnprefixed.js
similarity index 100%
rename from __tests__/languageStrategy/defaultUnprefixed.js
rename to tests/languageStrategy/defaultUnprefixed.js
diff --git a/__tests__/languageStrategy/subdomainBased.js b/tests/languageStrategy/subdomainBased.js
similarity index 100%
rename from __tests__/languageStrategy/subdomainBased.js
rename to tests/languageStrategy/subdomainBased.js