diff --git a/.travis.yml b/.travis.yml
index 384c852..48cebe7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,33 @@ language: cpp
 before_install:
   - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include"
   - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib"
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew outdated openssl || brew upgrade openssl; brew install mysql sqlite hiredis; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated openssl || brew upgrade openssl; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink protobuf; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mysql sqlite hiredis; fi
 
 matrix:
   include:
   - os: linux
+    arch: amd64
+    dist: xenial
+    sudo: required
+    addons:
+      apt:
+        packages:
+        - mysql-client
+        - debhelper
+        - dpkg-dev
+        - libssl-dev
+        - libevent-dev
+        - sqlite3
+        - libsqlite3-dev
+        - postgresql-client
+        - libpq-dev
+        - libmysqlclient-dev
+        - libhiredis-dev
+  - os: linux
+    arch: arm64
     dist: precise
     sudo: required
     addons:
@@ -43,9 +65,9 @@ matrix:
         - libmysqlclient-dev
         - libhiredis-dev
   - os: osx
-    osx_image: xcode9.4
+    osx_image: xcode10.3
   - os: osx
-    osx_image: xcode8.3
+    osx_image: xcode9.4
 
 notifications:
   slack: