diff --git a/Cargo.lock b/Cargo.lock
index e2049f65bc..64ec06f049 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,8 +110,6 @@ name = "cookie"
 version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -212,7 +210,6 @@ dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -472,7 +469,6 @@ name = "rustup-mock"
 version = "0.1.9"
 dependencies = [
  "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustup-utils 0.1.9",
@@ -480,6 +476,7 @@ dependencies = [
  "tar 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "winreg 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml
index 016a8ac3f6..77622da495 100644
--- a/src/rustup-mock/Cargo.toml
+++ b/src/rustup-mock/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://github.com/rust-lang-nursery/rustup.rs"
 repository = "https://github.com/rust-lang-nursery/rustup.rs"
 
 [dependencies]
-hyper = "0.9.2"
+url = "1.1.0"
 scopeguard = "0.1.2"
 lazy_static = "0.1.15"
 walkdir = "0.1.5"
diff --git a/src/rustup-mock/src/clitools.rs b/src/rustup-mock/src/clitools.rs
index 53f6fa3b40..6d32f25f2f 100644
--- a/src/rustup-mock/src/clitools.rs
+++ b/src/rustup-mock/src/clitools.rs
@@ -13,7 +13,7 @@ use {MockInstallerBuilder, MockCommand};
 use dist::{MockDistServer, MockChannel, MockPackage,
            MockTargettedPackage, MockComponent, change_channel_date,
            ManifestVersion};
-use hyper::Url;
+use url::Url;
 use scopeguard;
 
 /// The configuration used by the tests in this module
diff --git a/src/rustup-mock/src/dist.rs b/src/rustup-mock/src/dist.rs
index 3a453f8697..bb8d488d27 100644
--- a/src/rustup-mock/src/dist.rs
+++ b/src/rustup-mock/src/dist.rs
@@ -2,7 +2,7 @@
 //! distribution server, with v1 and v2 manifests.
 
 use MockInstallerBuilder;
-use hyper::Url;
+use url::Url;
 use std::path::{PathBuf, Path};
 use std::fs::{self, File};
 use std::collections::HashMap;
diff --git a/src/rustup-mock/src/lib.rs b/src/rustup-mock/src/lib.rs
index 2c8a5e7e52..436b4b5c08 100644
--- a/src/rustup-mock/src/lib.rs
+++ b/src/rustup-mock/src/lib.rs
@@ -1,6 +1,6 @@
 //! Mocks for testing
 
-extern crate hyper;
+extern crate url;
 #[macro_use]
 extern crate lazy_static;
 extern crate scopeguard;