diff --git a/.travis.yml b/.travis.yml
index e97acdb..baa4f73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,14 @@
 language: emacs-lisp
 env:
-  matrix:
-    - emacs=emacs24
-    - emacs=emacs-snapshot
+  - EVM_EMACS=emacs-24.5-travis
+  - EVM_EMACS=emacs-26.3-travis-linux-xenial
+  - EVM_EMACS=emacs-git-snapshot-travis-linux-xenial
 
 before_install:
-  - sudo add-apt-repository -y ppa:cassou/emacs
-  - sudo add-apt-repository -y ppa:ubuntu-elisp
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq $emacs
+  - git clone https://github.com/rejeep/evm.git $HOME/.evm
+  - export PATH=$HOME/.evm/bin:$PATH
+  - evm config path /tmp
+  - evm install $EVM_EMACS --use --skip
 
 script:
   - make test
diff --git a/Makefile b/Makefile
index 13fd618..84c0a21 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 emacs ?= emacs
-# emacs = emacs-24.3
 
 LOAD = -l lv.el -l hydra.el -l hydra-test.el