diff --git a/Makefile b/Makefile
index c1105995..a9f7cdb7 100644
--- a/Makefile
+++ b/Makefile
@@ -128,12 +128,7 @@ install:
 
 .PHONY: ember
 ember:
-	npm install -g bower
-	npm install -g ember-cli
-	cd gui && rm -rf dist tmp
-	cd gui && npm cache clean
-	cd gui && bower cache clean
-	cd gui && rm -rf node_modules
-	cd gui && rm -rf bower_components
-	cd gui && npm install && bower install
+	cd gui && make setup
+	cd gui && make install
+	cd gui && make tests
 	cd gui && ember build -prod -o ../app/