diff --git a/.travis.yml b/.travis.yml
index eb5f294b..fa490d95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,19 +19,24 @@ env:
     - secure: "SsepHEYRmW9ee3RhxPpqGuPigZINFfA/yOwUJFseQt4t+Zs90r1xdl3Q8eDfPlnvBsL7Rd0QQrFDO7JUaimVLlgQkUnrl62o0CYzkodp+qtocyAHS00W6WTqi8Y6E6KBxPshCl03dRLaySUfx5TqTLTIHkJ0G6vDW35k7hRrA3221lRphs5rrpvAZ21pqsDsNLH3HVo792L6A0kOtBa3ocw1pgHLxnBbArIViu2htUuFvY/TgsmVbAdlow0efw/xkcJ/p0/r5q7igLek6Iqk8udfRc7CktvoiFQ2vUnhtNtQu/zYll3Q7OUx5d+w5lhbzz2QINmsezBEisH9k1haL7dMviLPp0pn4WZed60KovO0Iqfgjy1utTaKvJVfNWYsgkfU8c9a/z2rcZOKwXNKQW2ptBrtVjaB9dk7eMoyuFCDZwNtKqvG+ZKmvMpun+R8mmx+buOmN8Vlf5ygIoGxz3nbEtlLYGVTXHfdXXqRkFIwtiYVJEO7SLRKT9pbx1E++ARsi2+y8bXJT4e4z0osYMq9EsiFUpw3J2gcshrgseqkB7UgCZ3SXuitJnJNfDAU3a3nwwS/JiAunZMNnC4rKUBbl7WbTB4Cpw7EgVOlCqcyyzlkNl3xabLzTFzLOfSHLTVX5FmGNsD21vBoS5/8ejftx9wuV3rGHxuO3i3+A3k="
 
 script:
-  # Build library standalone, with Iron, and with Rocket integrations enabled, respectively
+  # Build all crates.
   - cargo build --all --verbose
-  - cargo build --all --verbose --features iron-handlers
+  # Run all tests for all crates.
+  - cargo test --all
+
+  # Build and run tests for main juniper crate with certain features.
+  - cd juniper
+  - cargo build --verbose --features iron-handlers
   - |
     if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-      cargo build --all --verbose --features rocket-handlers
+      cargo build --verbose --features rocket-handlers
     fi
 
   # Build example binaries; first Iron, then Rocket examples
-  - cargo build --all --verbose --example server --features "iron-handlers expose-test-schema"
+  - cargo build --verbose --example server --features "iron-handlers expose-test-schema"
   - |
     if [ "TRAVIS_RUST_VERSION" = "nightly" ]; then
-      cargo build --all --verbose --example rocket-server --features "rocket-handlers expose-test-schema"
+      cargo build --verbose --example rocket-server --features "rocket-handlers expose-test-schema"
     fi
 
   # Run all tests for the base library and available integrations
@@ -41,7 +46,7 @@ script:
       export TEST_FEATURES="$TEST_FEATURES rocket-handlers rocket/testing"
     fi
 
-  - cargo test --all --verbose --features "$TEST_FEATURES"
+  - cargo test --verbose --features "$TEST_FEATURES"
 
 
 before_deploy:
diff --git a/appveyor.yml b/appveyor.yml
index 768a0355..2914ac34 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,8 +48,12 @@ install:
 build: false
 
 test_script:
-  # Build library standalone, with Iron, and with Rocket integrations enabled, respectively
-  - cargo build --verbose
+  # Build and test all crates.
+  - cargo build --all --verbose
+  - cargo test --all
+
+  # Build and test main juniper crate with certain features.
+  - cd juniper
   - cargo build --verbose --features iron-handlers
   - IF "%CHANNEL%"=="nightly" (cargo build --verbose --features rocket-handlers)