diff --git a/.travis.yml b/.travis.yml
index bc44d3c..d67a96c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,11 +40,15 @@ matrix:
 
 script:
  - cargo check --all-targets
- - cargo test
+ - cargo test --lib
+ - cargo test --doc
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cargo test --tests; fi
 
 before_install:
- - docker pull greenmail/standalone:1.5.8
- - docker run -t -i -e GREENMAIL_OPTS='-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose' -p 3025:3025 -p 3110:3110 -p 3143:3143 -p 3465:3465 -p 3993:3993 -p 3995:3995 greenmail/standalone:1.5.8
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+     docker pull greenmail/standalone:1.5.8 &&
+     docker run -t -i -e GREENMAIL_OPTS='-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose' -p 3025:3025 -p 3110:3110 -p 3143:3143 -p 3465:3465 -p 3993:3993 -p 3995:3995 greenmail/standalone:1.5.8;
+   fi
 
 after_success: |
   wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&