diff --git a/.gitignore b/.gitignore
index be3d80a6a..ae7849d51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-/pkg
-/bin
 /restic
 /.vagrant
-/vendor/pkg
 /doc/_build
diff --git a/Makefile b/Makefile
index fa1804cfa..840714a48 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ restic:
 	go run build.go
 
 clean:
-	rm -rf restic
+	rm -f restic
 
 test:
-	go test ./...
+	go test ./cmd/... ./internal/...