diff --git a/.travis.yml b/.travis.yml
index e69f25f..c56f4dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: rust
 rust:
-    - 1.29.0
+    - 1.30.0
 cache:
   cargo: true
   timeout: 1200
diff --git a/ci.sh b/ci.sh
index 38ae94f..12fc541 100755
--- a/ci.sh
+++ b/ci.sh
@@ -9,8 +9,8 @@ export RUSTFLAGS="-D warnings -C target-cpu=native"
 # Currently, mlocking secrets is disabled due to secure memory limit issues.
 export MLOCK_SECRETS=false
 
-cargo clippy --all-targets -- --deny clippy
-cargo clippy --all-features --all-targets -- --deny clippy
+cargo clippy --all-targets -- --deny clippy::all
+cargo clippy --all-features --all-targets -- --deny clippy::all
 cargo fmt -- --check
 
 # We only test with mocktography, to ensure tests aren't unreasonably long.
diff --git a/tests/net_dynamic_hb.rs b/tests/net_dynamic_hb.rs
index 0e23577..44e19fe 100644
--- a/tests/net_dynamic_hb.rs
+++ b/tests/net_dynamic_hb.rs
@@ -149,7 +149,7 @@ fn do_drop_and_readd(cfg: TestConfig) {
         net.correct_nodes().map(|n| *n.id()).collect();
     let mut expected_outputs: collections::BTreeMap<_, collections::BTreeSet<_>> = net
         .correct_nodes()
-        .map(|n| (*n.id(), (0..10).into_iter().collect()))
+        .map(|n| (*n.id(), (0..10).collect()))
         .collect();
 
     // Run the network:
diff --git a/tests/net_util.rs b/tests/net_util.rs
index f76b512..be458ee 100644
--- a/tests/net_util.rs
+++ b/tests/net_util.rs
@@ -181,6 +181,7 @@ fn network_to_u32_is_correct() {
 }
 
 #[test]
+#[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
 fn network_from_u32_is_correct() {
     assert_eq!(NetworkDimension::new(1, 0), NetworkDimension::from(0u32));
     assert_eq!(NetworkDimension::new(2, 0), NetworkDimension::from(1u32));
diff --git a/tests/subset.rs b/tests/subset.rs
index 4c2e8d9..4c86701 100644
--- a/tests/subset.rs
+++ b/tests/subset.rs
@@ -110,11 +110,8 @@ fn test_subset_5_nodes_different_proposed_values() {
         Vec::from("Delta"),
         Vec::from("Echo"),
     ];
-    let proposals: BTreeMap<NodeId, ProposedValue> = (0..5)
-        .into_iter()
-        .map(NodeId)
-        .zip(proposed_values)
-        .collect();
+    let proposals: BTreeMap<NodeId, ProposedValue> =
+        (0..5).map(NodeId).zip(proposed_values).collect();
     let adversary = |_| SilentAdversary::new(MessageScheduler::Random);
     let network = new_network(5, 0, adversary);
     test_subset(network, &proposals);