diff --git a/README.md b/README.md
index 8e46b803c2a6f0a7edb26a101c64084d42ac9a1f..aed60de162ce7e5800732a19f00e122cf62feb48 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,21 @@ store.dispatch(actions.focusWindow('window-1'))
 ```javascript
 store.getState()
 ```
+
+## Running the tests
+
+```sh
+$ npm test
+```
+
+or to continually watch the source files
+
+```sh
+$ npm run test:watch
+```
+
+## Linting the project
+
+```sh
+$ npm run lint
+```
diff --git a/package.json b/package.json
index 2b9a0a9fa64cda9bfcb1096bfafb5f72724d641e..e7acc22573a152a31a821ad1e6c5e9b17def69a6 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "lint": "node_modules/.bin/eslint ./",
-    "test": "node_modules/.bin/jest",
+    "test": "npm run lint && node_modules/.bin/jest",
     "test:watch": "npm test -- --watch",
     "build:umd": "node_modules/.bin/webpack --output-filename index.umd.js"
   },