diff --git a/.travis.yml b/.travis.yml
index 85d2579bc8218b25e7fb3c65766a17963848da07..ba0bb480c77d7035c6859d828be9fc398630e7c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,19 +4,23 @@ os:
     - osx
 compiler:
     - clang
+notifications:
+    email:
+        on_success: change
+        on_failure: change
 env:
     global:
-        - PATH="${PATH}:${HOME}/.local/bin"
         - PKG_CONFIG_PATH="${HOME}/.local/lib/pkgconfig"
         - LD_LIBRARY_PATH="${HOME}/.local/lib"
+        - PATH="${PATH}:${HOME}/.local/bin"
         - CFLAGS="${CFLAGS} -O0 -g -DNDEBUG"
-        - MAKEOPTS="-j2"
 before_script:
     - ./scripts/bootstrap-depends.sh ${HOME}/.local
     - pip install --user travis -r tests/pydnstest/requirements.txt cpp-coveralls
 script:
-    - make ${MAKEOPTS} check COVERAGE=1 LDFLAGS="-L${HOME}/.local/lib"
-    - coveralls -i lib -x ".c" --gcov-options '\-lp'
+    - make ${MAKEOPTS} check COVERAGE=1
+after_success:
+    - test $TRAVIS_OS_NAME = linux && coveralls -i lib -x ".c" --gcov-options '\-lp'
 sudo: false
 cache:
     directories:
diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh
index d07e13c96a6601f1fa70ed83712d5402a72fc0a2..7638aaa3694089776fb1a8b4169ff824fa2d8040 100755
--- a/scripts/bootstrap-depends.sh
+++ b/scripts/bootstrap-depends.sh
@@ -38,7 +38,7 @@ fi
 
 # cmocka
 if [ ! -e ${PREFIX}/include/cmocka.h ]; then
-	git clone -b ${CMOCKA_TAG} git://git.cryptomilk.org/projects/cmocka.git
+	git clone -b ${CMOCKA_TAG} git://git.cryptomilk.org/projects/cmocka.git || true
 	cd cmocka
 	mkdir build
 	cd build