diff --git a/Makefile b/Makefile
index 45389c1..71bd3cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 .PHONY: test format magneticod magneticow ensure test-magneticod test-magneticow test-persistence image image-magneticow image-magneticod
 
-all: test magneticod magneticow
+all: ensure test magneticod magneticow
 
 magneticod:
 	go install --tags fts5 "-ldflags=-s -w" github.com/boramalper/magnetico/cmd/magneticod
 
 magneticow:
 	# TODO: minify files!
-	go-bindata -o="cmd/magneticow/bindata.go" -prefix="cmd/magneticow/data/" cmd/magneticow/data/...
+	go-bindata -o="cmd/magneticow/bindata.go" -prefix="cmd/magneticow/data/" -pkg="main" cmd/magneticow/data/...
 	go install --tags fts5 "-ldflags=-s -w" github.com/boramalper/magnetico/cmd/magneticow
 
 image-magneticod:
@@ -21,11 +21,13 @@ image: image-magneticod image-magneticow
 # Download dependencies
 ensure:
 	dep ensure -v
+	go get -u github.com/jteeuwen/go-bindata/...
 
 test-magneticod:
 	go test github.com/boramalper/magnetico/cmd/magneticod/...
 
 test-magneticow:
+	go-bindata -o="cmd/magneticow/bindata.go" -prefix="cmd/magneticow/data/" -pkg="main" cmd/magneticow/data/...
 	go test github.com/boramalper/magnetico/cmd/magneticow/...
 
 test-persistence: