diff --git a/.travis.yml b/.travis.yml
index 4a31ef53c2bd..f1a1a73b3a14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2018-04-19
+  - rust: nightly-2018-06-20
     env: CLIPPY_AND_COMPILE_TESTS=YESPLEASE
     script:
     - (cd diesel && cargo rustc --no-default-features --features "lint sqlite postgres mysql extras" -- -Zno-trans)
diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
index 568f981e8b85..7b0fcd8fa2d4 100644
--- a/diesel/Cargo.toml
+++ b/diesel/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["database"]
 byteorder = "1.0"
 diesel_derives = "~1.3.0"
 chrono = { version = "0.4", optional = true }
-clippy = { optional = true, version = "=0.0.195" }
+clippy = { optional = true, version = "=0.0.209" }
 libc = { version = "0.2.0", optional = true }
 libsqlite3-sys = { version = ">=0.8.0, <0.10.0", optional = true, features = ["min_sqlite_version_3_7_16"] }
 mysqlclient-sys = { version = ">=0.1.0, <0.3.0", optional = true }
diff --git a/diesel/src/pg/types/date_and_time/std_time.rs b/diesel/src/pg/types/date_and_time/std_time.rs
index 6dd5d5b456cf..173367341645 100644
--- a/diesel/src/pg/types/date_and_time/std_time.rs
+++ b/diesel/src/pg/types/date_and_time/std_time.rs
@@ -53,7 +53,7 @@ fn usecs_to_duration(usecs_passed: u64) -> Duration {
 
 fn duration_to_usecs(duration: Duration) -> u64 {
     let seconds = duration.as_secs() * USEC_PER_SEC;
-    let subseconds = duration.subsec_nanos() / NANO_PER_USEC;
+    let subseconds = duration.subsec_micros();
     seconds + u64::from(subseconds)
 }
 
diff --git a/diesel_cli/Cargo.toml b/diesel_cli/Cargo.toml
index 5dbc05b9692e..8e010044ed28 100644
--- a/diesel_cli/Cargo.toml
+++ b/diesel_cli/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/main.rs"
 [dependencies]
 chrono = "0.4"
 clap = "2.27"
-clippy = { optional = true, version = "=0.0.195" }
+clippy = { optional = true, version = "=0.0.209" }
 diesel = { version = "~1.3.0", default-features = false }
 dotenv = ">=0.8, <0.11"
 migrations_internals = "~1.3.0"
diff --git a/diesel_derives/Cargo.toml b/diesel_derives/Cargo.toml
index 9b24e2003d04..0f2132158d29 100644
--- a/diesel_derives/Cargo.toml
+++ b/diesel_derives/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/diesel-rs/diesel/tree/master/diesel_derives"
 [dependencies]
 syn = { version = "0.13.0", features = ["full", "fold"] }
 quote = "0.5.0"
-clippy = { optional = true, version = "=0.0.195" }
+clippy = { optional = true, version = "=0.0.209" }
 proc-macro2 = "0.3.0"
 
 [dev-dependencies]
diff --git a/diesel_migrations/Cargo.toml b/diesel_migrations/Cargo.toml
index 1bd5483ac651..ce3606127a15 100644
--- a/diesel_migrations/Cargo.toml
+++ b/diesel_migrations/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "http://diesel.rs"
 
 
 [dependencies]
-clippy = { optional = true, version = "=0.0.195" }
+clippy = { optional = true, version = "=0.0.209" }
 migrations_internals = "~1.3.0"
 migrations_macros = "~1.3.0"
 
diff --git a/diesel_migrations/migrations_internals/Cargo.toml b/diesel_migrations/migrations_internals/Cargo.toml
index 8f7d24b86436..425f067d2db1 100644
--- a/diesel_migrations/migrations_internals/Cargo.toml
+++ b/diesel_migrations/migrations_internals/Cargo.toml
@@ -7,7 +7,7 @@ description = "Internal implementation of diesels migration mechanism"
 homepage = "http://diesel.rs"
 
 [dependencies]
-clippy = { optional = true, version = "=0.0.195" }
+clippy = { optional = true, version = "=0.0.209" }
 diesel = { version = "~1.3.0", default-features = false }
 barrel = { version = "<= 0.2.0", optional = true, features = ["diesel-filled"] }
 
diff --git a/diesel_migrations/migrations_macros/Cargo.toml b/diesel_migrations/migrations_macros/Cargo.toml
index 6731c48fc7dd..c7d4aa94ea0f 100644
--- a/diesel_migrations/migrations_macros/Cargo.toml
+++ b/diesel_migrations/migrations_macros/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "http://docs.diesel.rs"
 homepage = "http://diesel.rs"
 
 [dependencies]
-clippy = { optional = true, version = "=0.0.195" }
+clippy = { optional = true, version = "=0.0.209" }
 migrations_internals = "~1.3.0"
 syn = { version = "0.11.4", features = ["aster"] }
 quote = "0.3.12"