diff --git a/parser/.travis.yml b/parser/.travis.yml
index 6e6d706..c7043aa 100644
--- a/parser/.travis.yml
+++ b/parser/.travis.yml
@@ -11,10 +11,10 @@ env:
   global:
     - secure: ZUcdcbS8xbpdII9FSPx7VtoVhEkJhWL2Hb75tDlKDHNhfXqmt1NyB9q/2qXJ5Ulp4MnYXwsI8LsDloR6gvdB4xElay3smuF/neGvMjrqcB15/2p0MSQ+kZjMsNB6mlb5kAlm8ahduXIscppmw/V+m5hn3Vo+RQz/Ng+pzv0nc8KEXPMYrfRFg+a7FaeIbRbb8ir9EfflUSqArLq2hbi2WdhM3hFMcCIAUt6DD4x5ubjEg60OnIof5FDu0mXMXzQvUfHWOeYnsNcD/DLyDnm6FuQEzk37M4EB8op2SdBUeQMQ5abR3i2rd//DZpbTTEjud0PseWohGAwTwL2aoFrqs7uYQMx+vcGlOzAyDUm4VemVUa3F2BECdzU5BiujcKOITJEVUYWongld93arQq34FuXG/TO/T1XrerxfG6LTkTkKS5Vz7W8z6Rloa99WrQLJg1ZJP6itEU7G7KsDFVgRhsg7rz4/dV/2+cV4UvIwd4HlGXKCFlH0SClqvM3/7i/qqCD0689SJW6Zip+ly38MXlGy2s/AmReEasXvFer9JkOEIuPa8QTBNAjDlw7bWXi6neQWBIZU1VhZcSssnrVmEFN8fNklShzpw5DyKCv8jPTx2O6Dw8B/LgIK8uo+eaTXiO6zz/T1c/qEdsYslvxPA2D3F+ONpPU7238ykT4eRog=
 script:
+  - cargo build --verbose
   - |
       if [ "$TRAVIS_RUST_VERSION" = nightly ]; then
-          cargo build --features clippy --verbose
-      else
-          cargo build --verbose
+          cargo install clippy --debug
+          cargo clippy -- -Dclippy
       fi
   - cargo test --verbose
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
index 00688e7..0c79598 100644
--- a/parser/Cargo.toml
+++ b/parser/Cargo.toml
@@ -10,7 +10,6 @@ repository = "https://github.com/chyh1990/yaml-rust"
 publish = false # this branch contains breaking changes
 
 [dependencies]
-clippy = { version = "^0.*", optional = true }
 linked-hash-map = ">=0.0.9, <0.5"
 
 [dev-dependencies]
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
index aa35e47..e16449c 100644
--- a/parser/src/lib.rs
+++ b/parser/src/lib.rs
@@ -36,11 +36,8 @@
 //!
 //! ```
 
-#![cfg_attr(feature="clippy", feature(plugin))]
-#![cfg_attr(feature="clippy", plugin(clippy))]
-#![cfg_attr(feature="clippy", deny(clippy))]
-#![cfg_attr(feature="clippy", warn(cyclomatic_complexity))]
-#![cfg_attr(feature="clippy", allow(match_same_arms))]
+#![cfg_attr(feature = "cargo-clippy", warn(cyclomatic_complexity))]
+#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
 
 extern crate linked_hash_map;
 
diff --git a/parser/src/yaml.rs b/parser/src/yaml.rs
index 94f60bf..b8d8163 100644
--- a/parser/src/yaml.rs
+++ b/parser/src/yaml.rs
@@ -273,7 +273,7 @@ impl Yaml {
     }
 }
 
-#[cfg_attr(feature="clippy", allow(should_implement_trait))]
+#[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))]
 impl Yaml {
     // Not implementing FromStr because there is no possibility of Error.
     // This function falls back to Yaml::String if nothing else matches.