diff --git a/.travis.yml b/.travis.yml
index 9dfcab1..c31782d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,42 +2,40 @@ language: node_js
 node_js:
   - "8"
 dist: trusty   # needed for chrome headless
-sudo: required # needed for chrome headless
+sudo: required # needed for various sudo operations
 addons:
   chrome: stable
   postgresql: "10"
   apt:
     packages:
-    - postgresql-10
-    - postgresql-client-10
-    - postgresql-contrib-10
-    # the following are mastodon dependencies
-    - imagemagick
-    - libpq-dev
-    - libxml2-dev
-    - libxslt1-dev
-    - file
-    - g++
-    - libprotobuf-dev
-    - protobuf-compiler
-    - pkg-config nodejs
-    - gcc
     - autoconf
     - bison
     - build-essential
-    - libssl-dev
-    - libyaml-dev
-    - libreadline6-dev
-    - zlib1g-dev
-    - libncurses5-dev
+    - file
+    - g++
+    - gcc
+    - imagemagick
     - libffi-dev
-    - libgdbm3
     - libgdbm-dev
-    - redis-tools
-    - libidn11-dev
+    - libgdbm3
     - libicu-dev
-services:
-  - redis-server
+    - libidn11-dev
+    - libncurses5-dev
+    - libpq-dev
+    - libprotobuf-dev
+    - libreadline6-dev
+    - libssl-dev
+    - libxml2-dev
+    - libxslt1-dev
+    - libyaml-dev
+    - pkg-config nodejs
+    - postgresql-10
+    - postgresql-client-10
+    - postgresql-contrib-10
+    - protobuf-compiler
+    - redis-tools
+    - tcl # required to build redis from source
+    - zlib1g-dev
 before_install:
   - npm install -g npm@6
   - npm install -g greenkeeper-lockfile@1
diff --git a/bin/setup-mastodon-in-travis.sh b/bin/setup-mastodon-in-travis.sh
index fe9c1ad..610fead 100755
--- a/bin/setup-mastodon-in-travis.sh
+++ b/bin/setup-mastodon-in-travis.sh
@@ -6,13 +6,25 @@ if [[ "$COMMAND" = deploy-dev-travis ]]; then
   exit 0 # no need to setup mastodon in this case
 fi
 
+# install ruby
 source "$HOME/.rvm/scripts/rvm"
 rvm install 2.5.1
 rvm use 2.5.1
 
+# build redis from source until this is fixed: https://git.io/fxjkb
+curl -O http://download.redis.io/redis-stable.tar.gz
+tar -xzf redis-stable.tar.gz
+cd redis-stable
+make
+sudo make install
+redis-server --daemonize yes
+
+# install ffmpeg from PPA because it's not in Trusty
 sudo -E add-apt-repository -y ppa:mc3man/trusty-media
 sudo -E apt-get update
 sudo -E apt-get install -y ffmpeg
+
+# check versions
 ruby --version
 node --version
 npm --version