diff --git a/.travis.yml b/.travis.yml
index 5ca68aa..03daa6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,17 @@
+language: rust
+os:
+  - linux
+  - osx
 env:
   global:
+    - LD_LIBRARY_PATH: /usr/local/lib
     - secure: i8Ijk6g4/26e3e7+r2OeGAPSP8G8O9P50JibW1omJ0j0ixXhyhPoY2bch3CGhnOu44dI5O31IIbjJJ+iEMp29xQBvkv9YpxAI+hIzOP+XAH6GCYxUDiBVcDoWrXTj+wU6/veuvjLCunu4eRHlskrgJbZXhUVODYzJuLgsN8Ou0w=
-before_install:
-#  - yes | sudo add-apt-repository ppa:hansjorg/rust
-#  - sudo apt-get update
-#  - sudo apt-get install rust-nightly
-  - curl -O http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
-  - curl -O http://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz
-  - tar xfz rust-nightly-x86_64-unknown-linux-gnu.tar.gz
-  - tar xfz cargo-nightly-x86_64-unknown-linux-gnu.tar.gz
-  - (cd rust-nightly-x86_64-unknown-linux-gnu/ && sudo ./install.sh)
-  - (cd cargo-nightly-x86_64-unknown-linux-gnu/ && sudo ./install.sh)
+before_script:
+  - rustc -v
+  - cargo -V
 script:
-  - cargo build
-  - cargo test
+  - cargo build -v
+  - cargo test -v
   - cargo doc
-branches:
-  only:
-    - master
 after_script:
   - cd target && curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh