diff --git a/Makefile b/Makefile
index 49215cc..a06ce59 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 CASK    := cask
 EMACS   := emacs
 
-SRCS    := $(shell cask files)
+SRCS    := $(filter-out %-autoloads.el, $(shell cask files))
 OBJS    := $(SRCS:.el=.elc)
 CHECKS  := $(wildcard test/*-test.el)
 PKGDIR  := $(shell $(CASK) package-directory)
@@ -27,32 +27,28 @@ lint-package:
 	@$(CASK) $(EMACS) --batch \
 	--eval "(require 'package)" \
 	--eval "(setq package-archives '((\"melpa\" . \"http://melpa.org/packages/\")))" \
-	--eval "(push '(\"local-melpa\" . \"'$(abspath ../local-melpa/packages/)'\") package-archives)" \
 	--eval "(package-initialize)" \
 	--eval "(package-refresh-contents)" \
 	-L '$(abspath .)' \
-	-l package-lint -f package-lint-batch-and-exit \
-	$(filter-out %-autoloads.el, $(SRCS))
+	-l package-lint -f package-lint-batch-and-exit $(SRCS)
 
 lint-elisp:
 	@$(CASK) $(EMACS) --batch \
 	--eval "(require 'package)" \
 	--eval "(setq package-archives '((\"melpa\" . \"http://melpa.org/packages/\")))" \
-	--eval "(push '(\"local-melpa\" . \"'$(abspath ../local-melpa/packages/)'\") package-archives)" \
 	--eval "(package-initialize)" \
 	--eval "(package-refresh-contents)" \
 	--eval "(setq make-backup-files nil)" \
 	-L '$(abspath .)' \
 	-l elisp-lint \
 	-f elisp-lint-files-batch --no-indent-character --no-fill-column \
-	$(filter-out %-autoloads.el, $(SRCS))
-	@$(RM) puppet-ts-mode-autoloads.el
+	$(SRCS)
 
 %.elc: %.el $(PKGDIR)
 	@$(CASK) build
 
 test/%.el: .FORCE
-	@$(CASK) emacs -Q -batch -L '$(abspath .)' -L test \
+	@$(CASK) $(EMACS) -Q -batch -L '$(abspath .)' -L test \
 		-l ert -l test/test-helper -l $@ \
 		-f ert-run-tests-batch-and-exit