diff --git a/.travis.yml b/.travis.yml
index 51db4f480..f7243b18c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,6 @@ sudo: false
 
 matrix:
   include:
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - bc
-            - expect
-            - gettext
-            - libncurses5-dev
     - os: linux
       compiler: gcc
       addons:
@@ -22,19 +13,19 @@ matrix:
             - gettext
             - lib32ncurses5-dev
             - g++-multilib
-      env:
-          - CXXFLAGS="-g -O2 -m32" CFLAGS="-g -m32"
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          packages:
-            - bc
-            - expect
-            - gettext
-            - libncurses5-dev
+            - ninja
             - cmake
+        coverity_scan:
+          project:
+            name: "fish-shell/fish-shell"
+            description: "The friendly interactive shell"
+          notification_email:
+            secure: "lq3AelSInSOqVJI2EZUTrsOrt9ev5c8DHMi7ESyefvv1p+7Qr2gRZmLa+dXLrkPegG+Op9Tykq9zwXRGC4pzC+0OelCKJgqpqkj6LwS8WSamiamAf9ZtPbANwSFMD17f/NTeG/OtBgq6Z87Nur2GEhxmSu3M9IEBOsnOgmCKo84="
+          build_command_prepend: "mkdir -p build; cd build; cmake -G ninja .."
+          build_command: "ninja"
+          branch_pattern: coverity_scan_master
       env:
+        - CXXFLAGS="-g -O2 -m32" CFLAGS="-g -m32"
         - USE_CMAKE="1" # Dummy value, shows up in the Travis UI only
       script:
         - mkdir build && cd build &&
@@ -42,41 +33,8 @@ matrix:
           make -j2 &&
           make install &&
           make test SHOW_INTERACTIVE_LOG=1
-    - os: linux
-      compiler: clang
-      env:
-          - CXXFLAGS="-g -O2 -fno-omit-frame-pointer -fsanitize=address" ASAN_OPTIONS=check_initialization_order=1:detect_stack_use_after_return=1:detect_leaks=1
-      before_install: export CXX=clang++-3.8
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-precise-3.8
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-3.8
-            - llvm-3.8 # for llvm-symbolizer
-            - bc
-            - expect
-            - gettext
-            - libncurses5-dev
-    - os: osx
-      before_install:
-        - brew update
-        - brew install pcre2 # use system PCRE2
-        - brew outdated xctool || brew upgrade xctool # for xcode... soon.
-      env:
-          - CXXFLAGS="-g -O2 -lstdc++"
   fast_finish: true
 
-script:
-  - autoreconf --no-recursive
-  - ./configure --prefix=$HOME/prefix || cat config.log
-  - make -j2 &&
-    make test DESTDIR=$HOME/prefix/ SHOW_INTERACTIVE_LOG=1 &&
-    make uninstall &&
-    echo "Checking for leftover files after make uninstall" &&
-    find $HOME/prefix/ -type f -print -exec false '{}' +
-
 notifications:
   # Some items are encrypted so that notifications from other repositories
   # don't flood the official repositories.
@@ -97,4 +55,4 @@ env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
-   - secure: "CWLImZSKyXzxuHKInSvV1zK6nFt3zDqTYJ4Ex3OGgKV18pT2dnav7d0ZYe6nottmlYPy802a1rIyCa5vEyQ8Q5OWStnuGP3Tlnzy4zDjd49q3CuspY1zXYOYmMGUoxlOJGjxJAStnDCPNK0T3rAy+0/JMO9x77ezrxtA+i5zMPg="
\ No newline at end of file
+   - secure: "CWLImZSKyXzxuHKInSvV1zK6nFt3zDqTYJ4Ex3OGgKV18pT2dnav7d0ZYe6nottmlYPy802a1rIyCa5vEyQ8Q5OWStnuGP3Tlnzy4zDjd49q3CuspY1zXYOYmMGUoxlOJGjxJAStnDCPNK0T3rAy+0/JMO9x77ezrxtA+i5zMPg="