diff --git a/Makefile b/Makefile
index 4b6451f..35709e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-EMACS = emacs
-# EMACS = emacs-24.3
+emacs ?= emacs
+# emacs = emacs-24.3
 
 LOAD = -l lv.el -l hydra.el -l hydra-test.el
 
@@ -8,10 +8,10 @@ LOAD = -l lv.el -l hydra.el -l hydra-test.el
 all: test
 
 test:
-	$(EMACS) -batch $(LOAD) -f ert-run-tests-batch-and-exit
+	$(emacs) -batch $(LOAD) -f ert-run-tests-batch-and-exit
 
 compile:
-	$(EMACS) -q $(LOAD) -l init.el --eval "(progn (mapc #'byte-compile-file '(\"hydra.el\" \"init.el\")) (switch-to-buffer \"*Compile-Log*\") (ert t))"
+	$(emacs) -q $(LOAD) -l hydra-init.el
 	make clean
 
 clean:
diff --git a/hydra-init.el b/hydra-init.el
new file mode 100644
index 0000000..80b4159
--- /dev/null
+++ b/hydra-init.el
@@ -0,0 +1,29 @@
+;;; hydra-test.el --- bare hydra init
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+(add-to-list 'load-path default-directory)
+(require 'hydra)
+(setq hydra-examples-verbatim t)
+(require 'hydra-examples)
+(require 'hydra-test)
+(mapc #'byte-compile-file '("hydra.el"))
+(switch-to-buffer "*Compile-Log*")
+(ert t)