diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs
index d6528ce977e98..0b15a38cddc79 100644
--- a/src/libstd/io/net/tcp.rs
+++ b/src/libstd/io/net/tcp.rs
@@ -521,11 +521,13 @@ impl Clone for TcpAcceptor {
 #[cfg(test)]
 #[allow(experimental)]
 mod test {
-    use io::net::tcp::*;
-    use io::net::ip::*;
-    use io::*;
-    use io::test::*;
-    use prelude::*;
+    use prelude::{Ok,Err,Some,None,Clone,ToString,Str,Iterator,spawn,channel,range,drop};
+    use io::test::{next_test_ip4,next_test_ip6};
+    use io::{TcpStream,Listener,Acceptor,Reader,Writer,
+             NotConnected,ConnectionReset,BrokenPipe,ConnectionAborted,PermissionDenied,
+             ConnectionRefused,EndOfFile,TimedOut,ShortWrite,IoError,OtherIoError};
+    use io::net::tcp::{TcpListener};
+    use io::net::ip::{SocketAddr};
 
     // FIXME #11530 this fails on android because tests are run as root
     #[cfg_attr(any(windows, target_os = "android"), ignore)]
diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs
index 53e60d553be5f..3a8c6917fcfb3 100644
--- a/src/libstd/io/net/udp.rs
+++ b/src/libstd/io/net/udp.rs
@@ -247,11 +247,11 @@ impl Writer for UdpStream {
 #[cfg(test)]
 #[allow(experimental)]
 mod test {
-    use super::*;
-    use prelude::*;
-    use io::*;
-    use io::net::ip::*;
-    use io::test::*;
+    use prelude::{Ok,Err,Some,None,Clone,spawn,channel,range,drop};
+    use io::test::{next_test_ip4,next_test_ip6};
+    use io::{Writer,Reader,PermissionDenied,TimedOut,IoError,ShortWrite};
+    use io::net::ip::{SocketAddr,Ipv4Addr};
+    use io::net::udp::UdpSocket;
 
     // FIXME #11530 this fails on android because tests are run as root
     #[cfg_attr(any(windows, target_os = "android"), ignore)]