diff --git a/.gitignore b/.gitignore
index 87f017249..0eed05504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ npm-*
 !.elasticbeanstalk/*.global.yml
 deploy.zip
 ENV
+
+# Test
+/.nyc_output
+/coverage
diff --git a/Makefile b/Makefile
index e94100fb3..82f7613df 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ clean:
 	mkdir -p build
 	mkdir -p intl
 
-
 deploy:
 	@make build
 	@make sync
@@ -52,13 +51,7 @@ start:
 test:
 	@make lint
 	@make build
-	@echo ""
-	@make unit
-	@echo ""
-	@make functional
-	@echo ""
-	@make localization
-	@echo ""
+	@make tap
 
 lint:
 	$(ESLINT) . --ext .js,.jsx,.json
@@ -77,6 +70,12 @@ integration:
 localization:
 	$(TAP) ./test/localization/*.js
 
+tap:
+	$(TAP) ./test/{unit,functional,localization}/*.js
+
+coverage:
+	$(TAP) ./test/{unit,functional,localization}/*.js --coverage --coverage-report=lcov
+
 # ------------------------------------
 
-.PHONY: build clean deploy translations webpack stop start test lint unit functional integration localization
+.PHONY: build clean deploy translations webpack start test lint unit functional integration localization tap coverage
diff --git a/package.json b/package.json
index 18d507095..e4a06db2a 100644
--- a/package.json
+++ b/package.json
@@ -87,11 +87,18 @@
     "slick-carousel": "1.5.8",
     "source-map-support": "0.3.2",
     "style-loader": "0.12.3",
-    "tap": "2.0.0",
+    "tap": "7.1.2",
     "url-loader": "0.5.6",
     "watch": "0.16.0",
     "webpack": "1.12.14",
     "webpack-dev-middleware": "1.2.0",
     "xhr": "2.2.0"
+  },
+  "nyc": {
+    "include": [
+        "bin/**/*.js",
+        "src/**/*.js"
+    ],
+    "all": true
   }
 }