diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 0fccf50e009..7f56fcf8e71 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -1131,6 +1131,7 @@ mod test {
 
     use extra::getopts::groups::getopts;
     use syntax::attr;
+    use syntax::attr::AttrMetaMethods;
     use syntax::diagnostic;
 
     // When the user supplies --test we should implicitly supply --cfg test
diff --git a/src/librustc/util/sha2.rs b/src/librustc/util/sha2.rs
index b3c4fbf1105..73d39d8145f 100644
--- a/src/librustc/util/sha2.rs
+++ b/src/librustc/util/sha2.rs
@@ -522,7 +522,7 @@ static H256: [u32, ..8] = [
 
 #[cfg(test)]
 mod tests {
-    use super::{Digest, Sha256};
+    use super::{Digest, Sha256, FixedBuffer};
     use std::vec;
     use std::rand::isaac::IsaacRng;
     use std::rand::Rng;
@@ -633,7 +633,7 @@ mod tests {
 #[cfg(test)]
 mod bench {
     use extra::test::BenchHarness;
-    use super::Sha256;
+    use super::{Sha256, FixedBuffer, Digest};
 
     #[bench]
     pub fn sha256_10(bh: &mut BenchHarness) {
diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs
index 2c0946f49ec..7d39be913b4 100644
--- a/src/librustpkg/tests.rs
+++ b/src/librustpkg/tests.rs
@@ -10,6 +10,7 @@
 
 // rustpkg unit tests
 
+use CtxMethods;
 use context::{BuildContext, Context, RustcFlags};
 use std::{os, run, str, task};
 use std::io;
diff --git a/src/librustuv/async.rs b/src/librustuv/async.rs
index d9589788c4d..5085dd64b67 100644
--- a/src/librustuv/async.rs
+++ b/src/librustuv/async.rs
@@ -125,7 +125,7 @@ impl Drop for AsyncWatcher {
 
 #[cfg(test)]
 mod test_remote {
-    use std::rt::rtio::Callback;
+    use std::rt::rtio::{Callback, RemoteCallback};
     use std::rt::thread::Thread;
 
     use super::AsyncWatcher;
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index 057e3f0b359..526ad60bb21 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -140,7 +140,7 @@ mod imp {
 
     #[cfg(test)]
     mod tests {
-        use option::{Some, None};
+        use prelude::*;
         use super::*;
         use unstable::finally::Finally;
 
diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs
index 2004dac0c7c..b86a9612d70 100644
--- a/src/libstd/rt/logging.rs
+++ b/src/libstd/rt/logging.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use container::Container;
-use fmt;
 use from_str::from_str;
 use iter::Iterator;
 use libc::exit;
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index ccffb11f73e..fb98f766fef 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -1109,6 +1109,7 @@ mod test {
     use codemap;
     use codemap::Spanned;
     use fold;
+    use fold::*;
     use parse;
     use parse::token::{fresh_mark, gensym, intern, ident_to_str};
     use parse::token;