diff --git a/.travis.yml b/.travis.yml
index aa603cb59..4023ea47b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ otp_release:
   - R16B03
   - R15B01
 
+services:
+  - riak
+
 before_install:
   - sudo apt-get -qq update
 
@@ -22,8 +25,8 @@ script:
   - ./autogen.sh
   - ./configure --enable-all --disable-http --disable-odbc
   - make
-  - make test
-  - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, 0 failed' logs/raw.log
+  - ERL_LIBS=$PWD make test
+  - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log
 
 after_script:
   - find logs -name suite.log -exec cat '{}' ';'