diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh
index 5721b1f48..c4c6128ae 100755
--- a/package/ci/travis-desktop.sh
+++ b/package/ci/travis-desktop.sh
@@ -21,7 +21,6 @@ mkdir build && cd build
 cmake .. \
     -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-    -DCMAKE_PREFIX_PATH=$HOME/glfw \
     -DCMAKE_BUILD_TYPE=Debug \
     -DWITH_AUDIO=ON \
     -DWITH_SHAPES=$BUILD_DEPRECATED \
diff --git a/package/ci/travis.yml b/package/ci/travis.yml
index ca4cb0e25..234323cee 100644
--- a/package/ci/travis.yml
+++ b/package/ci/travis.yml
@@ -6,19 +6,15 @@ addons:
     - ninja-build
     - lcov
     - libsdl2-dev
+    - libglfw3-dev
     - freeglut3-dev
     - libopenal-dev
-    # GLFW dependencies, libxi-dev will be needed in the future
-    - libxrandr-dev
-    - libxinerama-dev
-    - libxcursor-dev
-    #- libxi-dev
 
 matrix:
   include:
   - language: cpp
     os: linux
-    dist: trusty
+    dist: xenial
     compiler: gcc
     env:
     - JOBID=linux-gl
@@ -27,7 +23,7 @@ matrix:
     - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8"
   - language: cpp
     os: linux
-    dist: trusty
+    dist: xenial
     compiler: gcc
     env:
     - JOBID=linux-nondeprecated
@@ -35,7 +31,7 @@ matrix:
     - BUILD_DEPRECATED=OFF
   - language: cpp
     os: linux
-    dist: trusty
+    dist: xenial
     compiler: clang
     env:
     - JOBID=linux-sanitizers
@@ -44,21 +40,17 @@ matrix:
     addons:
       apt:
         sources:
-        - llvm-toolchain-trusty
+        - llvm-toolchain-xenial
         packages:
         - libgl1-mesa-dev
         - ninja-build
         - clang-3.8
         - libsdl2-dev
+        - libglfw3-dev
         - libopenal-dev
-        # GLFW dependencies, libxi-dev will be needed in the future
-        - libxrandr-dev
-        - libxinerama-dev
-        - libxcursor-dev
-        #- libxi-dev
   - language: cpp
     os: linux
-    dist: trusty
+    dist: xenial
     compiler: gcc
     env:
     - JOBID=linux-vulkan
@@ -71,7 +63,7 @@ matrix:
         - lcov
   - language: cpp
     os: linux
-    dist: trusty
+    dist: xenial
     compiler: gcc
     env:
     - JOBID=linux-gles2
@@ -81,7 +73,7 @@ matrix:
     - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8"
   - language: cpp
     os: linux
-    dist: trusty
+    dist: xenial
     compiler: gcc
     env:
     - JOBID=linux-gles3
@@ -136,6 +128,8 @@ matrix:
     - TARGET_GLES2=OFF
   - language: android
     os: linux
+    # Setting xenial here will cause it to use 12.04, with GCC 4.6 and other
+    # prehistoric nightmares. So staying with 14.04 for the time being.
     dist: trusty
     env:
     - JOBID=android-gles2
@@ -152,6 +146,8 @@ matrix:
       - sys-img-armeabi-v7a-android-22
   - language: android
     os: linux
+    # Setting xenial here will cause it to use 12.04, with GCC 4.6 and other
+    # prehistoric nightmares. So staying with 14.04 for the time being.
     dist: trusty
     env:
     - JOBID=android-gles3
@@ -178,7 +174,6 @@ notifications:
 cache:
   directories:
   - $HOME/sdl2
-  - $HOME/glfw
   - $HOME/cmake
 
 install:
@@ -210,9 +205,6 @@ install:
 
 # GLFW (cached)
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install glfw; fi
-# Keeping GLFW 3.1 because that's what is on 16.04 and we want to keep
-# supporting that. Latest GLFW is tested on macOS.
-- if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ) && [ ! -e "$HOME/glfw/include" ]; then wget https://github.com/glfw/glfw/releases/download/3.1.2/glfw-3.1.2.zip && unzip glfw-3.1.2.zip && cd glfw-3.1.2 && mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/glfw -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DBUILD_SHARED_LIBS=ON && cmake --build . --target install && cd ../..; fi
 
 script:
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then ./package/ci/travis-desktop.sh; fi