diff --git a/.huskyrc.js b/.huskyrc.js
deleted file mode 100644
index 394f6d0a..00000000
--- a/.huskyrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const tasks = arr => arr.join(" && ");
-module.exports = {
-  hooks: {
-    "pre-commit": tasks(["make test", "lint-staged"])
-  }
-};
diff --git a/package.json b/package.json
index ca98717c..149d0368 100644
--- a/package.json
+++ b/package.json
@@ -89,10 +89,14 @@
     "typescript": "3.2.2",
     "typescript-tslint-plugin": "^0.2.1"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged && make test"
+    }
+  },
   "lint-staged": {
     "linters": {
       "*.{js,jsx,ts,tsx,json,css,sass,md}": [
-        "echo here",
         "prettier --write",
         "git add"
       ]
@@ -100,5 +104,8 @@
     "ignore": [
       "**/public/*.min.js"
     ]
+  },
+  "prettier": {
+    "trailingComma": "all"
   }
 }