diff --git a/.travis.yml b/.travis.yml
index 937256f..ac45d8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
-# generic packages and latest Tmux 1.9a
+# generic packages and tmux
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y git-core expect
   - sudo apt-get install -y python-software-properties software-properties-common
-  - sudo add-apt-repository -y ppa:pi-rho/dev
-  - sudo apt-get update
-  - sudo apt-get install -y tmux=1.9a-1~ppa1~p
+  - sudo apt-get install -y libevent-dev libncurses-dev
+  - git clone https://github.com/tmux/tmux.git
+  - cd tmux
+  - git checkout 2.0
+  - sh autogen.sh
+  - ./configure && make && sudo make install
 
 install:
   - git fetch --unshallow --recurse-submodules || git fetch --recurse-submodules
diff --git a/lib/tmux-test b/lib/tmux-test
index e1b299b..1da4b13 160000
--- a/lib/tmux-test
+++ b/lib/tmux-test
@@ -1 +1 @@
-Subproject commit e1b299b6d75b6cbece0fec26257d3f6d6e95e494
+Subproject commit 1da4b13267bd35c921a4c383e5ccf1478e91b4d1