diff --git a/examples/tweeter.rs b/examples/tweeter.rs
index 9750f96..4f6e707 100644
--- a/examples/tweeter.rs
+++ b/examples/tweeter.rs
@@ -1,10 +1,9 @@
-#![feature(old_io, std_misc)]
+#![feature(std_misc, thread_sleep)]
 extern crate irc;
 
 use std::default::Default;
-use std::old_io::timer::sleep;
 use std::sync::Arc;
-use std::thread::spawn;
+use std::thread::{sleep, spawn};
 use std::time::duration::Duration;
 use irc::client::prelude::*;
 
diff --git a/src/client/data/message.rs b/src/client/data/message.rs
index 3506b70..b87dee3 100644
--- a/src/client/data/message.rs
+++ b/src/client/data/message.rs
@@ -210,7 +210,7 @@ mod test {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn to_message_invalid_format() {
         ":invalid :message".to_message();
     }
diff --git a/src/client/server/mod.rs b/src/client/server/mod.rs
index 0fd49a0..70eabfb 100644
--- a/src/client/server/mod.rs
+++ b/src/client/server/mod.rs
@@ -4,6 +4,7 @@
 #![stable]
 use std::borrow::ToOwned;
 use std::collections::HashMap;
+use std::error::Error as StdError;
 use std::io::{BufReader, BufWriter, Error, ErrorKind, Result};
 use std::sync::{Mutex, RwLock};
 use std::iter::Map;
@@ -434,7 +435,7 @@ mod test {
     }
 
     #[test]
-    #[should_fail(message = "All specified nicknames were in use.")]
+    #[should_panic(message = "All specified nicknames were in use.")]
     fn ran_out_of_nicknames() {
         let value = ":irc.pdgn.co 433 * test :Nickname is already in use.\r\n\
                      :irc.pdgn.co 433 * test2 :Nickname is already in use.\r\n";
diff --git a/src/lib.rs b/src/lib.rs
index ed1c9d4..ee4419a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@
 #![unstable]
 #![warn(missing_docs)]
 
-#![feature(collections, core, io, net, path)]
+#![feature(collections, core, io, str_char, tcp)]
 #[cfg(feature = "ctcp")] extern crate time;
 #[cfg(feature = "encode")] extern crate encoding;
 extern crate "rustc-serialize" as rustc_serialize;