diff --git a/.travis.yml b/.travis.yml
index e261a0d..62725b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,10 @@ env:
   - FEATURES='serde-1'
 matrix:
   include:
-    - rust: 1.20.0
+    - rust: stable
     - rust: stable
       env:
-        - NODEFAULT=1
-        - NODROP_FEATURES='use_needs_drop'
+      - FEATURES='serde-1'
     - rust: 1.22.1
       env:
       - FEATURES='array-sizes-33-128 array-sizes-129-255'
@@ -18,29 +17,29 @@ matrix:
     - rust: beta
     - rust: nightly
       env:
-        - NODEFAULT=1
-        - ARRAYVECTEST_ENSURE_UNION=1
-    - rust: nightly
-      env:
-      - NODROP_FEATURES='use_needs_drop'
       - ARRAYVECTEST_ENSURE_UNION=1
     - rust: nightly
       env:
-      - FEATURES='serde use_union'
-      - NODROP_FEATURES='use_union'
+      - FEATURES='serde'
       - ARRAYVECTEST_ENSURE_UNION=1
+    - rust: nightly
+      env:
+      - FEATURES='serde-1'
+      - ARRAYVECTEST_ENSURE_UNION=1
+    - rust: nightly
+      env:
+      - FEATURES='array-sizes-33-128 array-sizes-129-255'
 branches:
   only:
     - master
     - 0.4
 script:
   - |
-      ([ ! -z "$NODROP_FEATURES" ] || cargo build --verbose --features "$FEATURES") &&
-      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --no-default-features) &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo test --verbose --features "$FEATURES") &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo test --release --verbose --features "$FEATURES") &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo bench --verbose --features "$FEATURES" -- --test) &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo doc --verbose --features "$FEATURES") &&
-      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) &&
-      cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" &&
-      cargo bench --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" -- --test
+      cargo build -v --no-default-features &&
+      cargo build -v --features "$FEATURES" &&
+      cargo test -v --features "$FEATURES" &&
+      cargo test -v --release --features "$FEATURES" &&
+      cargo bench -v --features "$FEATURES" --no-run &&
+      cargo doc -v --features "$FEATURES" &&
+      cargo build -v --manifest-path=nodrop/Cargo.toml &&
+      cargo test -v --manifest-path=nodrop/Cargo.toml