diff --git a/.travis.yml b/.travis.yml
index fd51c6de..4830a041 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,53 +1,23 @@
 language: rust
 cache: cargo
-rust: stable
-#env:
-#  global:
-#    - TARGET=x86_64-unknown-linux-gnu
-matrix:
-  include:
-    - rust: beta
-    - rust: nightly
-#    - env: TARGET=i686-unknown-linux-gnu
-#      addons:
-#        apt:
-#          packages:
-#            - gcc-multilib
-#    - os: osx
-#      env: TARGET=x86_64-apple-darwin
-#    - os: osx
-#      env: TARGET=i686-apple-darwin
-#    - os: osx
-#      rust: beta
-#      env: TARGET=x86_64-apple-darwin
-#    - os: osx
-#      rust: beta
-#      env: TARGET=i686-apple-darwin
-  allow_failures:
-    - rust: nightly
+rust:
+  - stable
+  - beta
+  - nightly
+os:
+  - linux
+  - osx
 notifications:
   email:
     on_success: never
 before_install:
-#  - rustup target add $TARGET || true
   - travis_wait cargo install rustfmt --force || true
 before_script:
   - export PATH="$PATH":~/.cargo/bin
   - echo "\$ rustfmt --version"
-  - cd emerald-core
-  - cargo fmt -- --version
-  - cd ..
+  - cargo fmt --all -- --version
 script:
   - export RUST_BACKTRACE=1
-  - cd emerald-core
-  - cargo fmt -- --verbose --write-mode=diff
-  - cd ../emerald-cli
-  - cargo fmt -- --verbose --write-mode=diff
-#  - test "$TRAVIS_RUST_VERSION" == nightly || cargo test --target=$TARGET --verbose
-#  - test "$TRAVIS_RUST_VERSION" != nightly || cargo test --target=$TARGET --verbose --features "dev"
-# [Two different crates with name 'X' error only when using --target=](https://github.com/rust-lang/cargo/issues/3665)
-#  - cargo build --target=$TARGET --verbose --release
-  - test "$TRAVIS_RUST_VERSION" == nightly || cargo test --verbose
-  - test "$TRAVIS_RUST_VERSION" != nightly || cargo test --verbose --features "dev"
-  - cargo build --verbose --release
-  - cargo doc --no-deps
+  - cargo fmt --all -- --verbose --write-mode=diff
+  - cargo test --all --verbose
+  - cargo build --all --verbose --release