diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 50ce2e99..38ca4545 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -12,8 +12,8 @@ keywords = ["crypto", "tls", "ssl", "dtls"]
 [features]
 tlsv1_2 = ["openssl-sys/tlsv1_2"]
 tlsv1_1 = ["openssl-sys/tlsv1_1"]
-dtlsv1 = ["openssl-sys/dtlsv1", "connected_socket"]
-dtlsv1_2 = ["openssl-sys/dtlsv1_2", "connected_socket"]
+dtlsv1 = ["openssl-sys/dtlsv1"]
+dtlsv1_2 = ["openssl-sys/dtlsv1_2"]
 sslv2 = ["openssl-sys/sslv2"]
 aes_xts = ["openssl-sys/aes_xts"]
 npn = ["openssl-sys/npn"]
@@ -30,6 +30,5 @@ libc = "0.1"
 [dev-dependencies]
 rustc-serialize = "0.3"
 
-[dependencies.connected_socket]
+[dev-dependencies.connected_socket]
 connected_socket = "0.0.1"
-optional = true
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 5826e486..1d131010 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -10,6 +10,7 @@ extern crate openssl_sys as ffi;
 #[cfg(test)]
 extern crate rustc_serialize as serialize;
 
+#[cfg(test)]
 #[cfg(any(feature="dtlsv1", feature="dtlsv1_2"))]
 extern crate connected_socket;