diff --git a/.travis.yml b/.travis.yml
index ccd46b6..bbfa6d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,8 @@ before_install:
   - sudo add-apt-repository -y ppa:cassou/emacs
   - sudo apt-get update -qq
   - sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-gtk emacs-snapshot
+env:
+  - EMACS=emacs
+  - EMACS=emacs-snapshot
 script:
-  make travis-ci
+  make travis-ci EMACS=$EMACS
diff --git a/Makefile b/Makefile
index 921c91f..3524d63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+EMACS = emacs
+
 testein-default:
 	./testein.py --clean-elc --load-ert
 
@@ -16,18 +18,12 @@ interactive-testein-24:
 
 ert-compile: ert-clean
 	cd lib/ert/lisp/emacs-lisp/ && \
-		emacs -Q -L . -batch -f batch-byte-compile *.el
+		$(EMACS) -Q -L . -batch -f batch-byte-compile *.el
 
 ert-clean:
 	rm -f lib/ert/lisp/emacs-lisp/*.elc
 
-
 travis-ci: ert-compile
-
-	emacs-snapshot --version
-	./testein.py --no-func-test --clean-elc -e emacs-snapshot
-	tail -n3 test-load_messages_batch_emacs-snapshot.log
-
-	emacs --version
-	./testein.py --no-func-test --clean-elc --load-ert
-	tail -n3 test-load_messages_batch_emacs.log
+	$(EMACS) --version
+	./testein.py --no-func-test --clean-elc -e $(EMACS)
+	tail -n3 test-load_messages_batch_$(EMACS).log