diff --git a/.travis.yml b/.travis.yml
index 7bf68df1..dd7f2f00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: rust
 cache: cargo # cache cargo-audit once installed
 before_script:
-#  - cargo install --force clippy
+  - cargo install --force clippy
   - cargo install --force cargo-audit
   - cargo generate-lockfile
 script:
@@ -33,15 +33,14 @@ jobs:
       script: ./scripts/cargo-doc.sh
 script:
   - cargo build --verbose --all
-#  - cargo clippy --all-targets --all-features -- -D warnings # Check tests and non-default crate features.
+  - cargo clippy --all-targets --all-features -- -D warnings -A clippy::comparison-chain -A clippy::many-single-char-names # Check tests and non-default crate features.
   - cargo test --verbose --all
   - cargo test --features edn/serde_support --verbose --all
   # We can't pick individual features out with `cargo test --all` (At the time of this writing, this
   # works but does the wrong thing because of a bug in cargo, but its fix will be to disallow doing
   # this all-together, see https://github.com/rust-lang/cargo/issues/5364 for more information). To
-  # work around this, we run tests individually for subcrates that rely on `rusqlite`.
+  # work around this, we run tests individually for sub-crates that rely on `rusqlite`.
   - |
     for crate in "" "db" "db-traits" "ffi" "public-traits" "query-projector" "query-projector-traits" "query-pull" "sql" "tolstoy" "tolstoy-traits" "transaction" "tools/cli"; do
       cargo test --manifest-path ./$crate/Cargo.toml --verbose --no-default-features --features sqlcipher
     done
-cache: cargo
diff --git a/public-traits/Cargo.toml b/public-traits/Cargo.toml
index b10db060..f1a4e2f4 100644
--- a/public-traits/Cargo.toml
+++ b/public-traits/Cargo.toml
@@ -16,7 +16,7 @@ syncable = ["tolstoy_traits", "hyper", "serde_json"]
 failure = "~0.1"
 failure_derive = "~0.1"
 http = "~0.2"
-tokio-core = "~0.1"
+tokio = { version = "~0.2", features = ["rt-core"] }
 uuid = "~0.8"
 
 [dependencies.rusqlite]
diff --git a/tolstoy/Cargo.toml b/tolstoy/Cargo.toml
index 6ec91177..8e149521 100644
--- a/tolstoy/Cargo.toml
+++ b/tolstoy/Cargo.toml
@@ -16,8 +16,7 @@ hyper-tls = "~0.4"
 http = "~0.2"
 log = "~0.4"
 mime = "~0.3"
-#tokio = { version = "0.2", features = ["full"] }
-tokio-core = "~0.1"
+tokio = { version = "~0.2", features = ["full"] }
 serde = "~1.0"
 serde_json = "~1.0"
 serde_cbor = "~0.11"