diff --git a/src/client.rs b/src/client.rs
index c828b00..74e3813 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -158,18 +158,18 @@ mod tests {
         let pool = ClientPool::new(uri);
 
         let pool1 = pool.clone();
-        let guard1 = thread::scoped(move || {
+        let guard1 = thread::spawn(move || {
             let client = pool1.pop();
             client.get_collection("test", "items");
         });
 
         let pool2 = pool.clone();
-        let guard2 = thread::scoped(move || {
+        let guard2 = thread::spawn(move || {
             let client = pool2.pop();
             client.get_collection("test", "items");
         });
 
-        guard1.join();
-        guard2.join();
+        guard1.join().unwrap();
+        guard2.join().unwrap();
     }
 }
diff --git a/src/database.rs b/src/database.rs
index fbfa8df..a7e63f3 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -87,10 +87,8 @@ impl<'a> Drop for Database<'a> {
 
 #[cfg(test)]
 mod tests {
-    use bson;
     use super::super::uri::Uri;
     use super::super::client::ClientPool;
-    use super::super::flags::{Flags};
 
     #[test]
     fn test_get_collection_and_name() {
diff --git a/src/lib.rs b/src/lib.rs
index 1b5c172..03588c6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(scoped)]
-
 extern crate libc;
 extern crate mongo_c_driver_wrapper;
 extern crate bson;