diff --git a/api/auth_test.go b/api/auth_test.go
index bfb7ce8976..926e825ed4 100644
--- a/api/auth_test.go
+++ b/api/auth_test.go
@@ -44,7 +44,6 @@ func (s *AuthSuite) SetUpSuite(c *C) {
 }
 
 func (s *AuthSuite) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/api/handler_test.go b/api/handler_test.go
index d00efdc28c..5366627151 100644
--- a/api/handler_test.go
+++ b/api/handler_test.go
@@ -36,7 +36,6 @@ func (s *HandlerSuite) SetUpSuite(c *C) {
 }
 
 func (s *HandlerSuite) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/api/service_consumption_test.go b/api/service_consumption_test.go
index 3219b4baa3..53e0a64c2d 100644
--- a/api/service_consumption_test.go
+++ b/api/service_consumption_test.go
@@ -38,7 +38,6 @@ func (s *ConsumptionSuite) SetUpSuite(c *C) {
 }
 
 func (s *ConsumptionSuite) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/api/service_provision_test.go b/api/service_provision_test.go
index cad8f4c532..fe73191c0e 100644
--- a/api/service_provision_test.go
+++ b/api/service_provision_test.go
@@ -39,7 +39,6 @@ func (s *ProvisionSuite) SetUpSuite(c *C) {
 }
 
 func (s *ProvisionSuite) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/api/suite_test.go b/api/suite_test.go
index 90ad7f2955..c01a643d1a 100644
--- a/api/suite_test.go
+++ b/api/suite_test.go
@@ -107,7 +107,6 @@ func (s *S) SetUpSuite(c *C) {
 func (s *S) TearDownSuite(c *C) {
 	defer s.t.S3Server.Quit()
 	defer s.t.IamServer.Quit()
-	defer s.conn.Close()
 	queue.Preempt()
 	s.conn.Apps().Database.DropDatabase()
 	fsystem = nil
diff --git a/api/writer_test.go b/api/writer_test.go
index 11136b7042..2f9ce5e3b4 100644
--- a/api/writer_test.go
+++ b/api/writer_test.go
@@ -29,7 +29,6 @@ func (s *WriterSuite) SetUpSuite(c *C) {
 }
 
 func (s *WriterSuite) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/app/suite_test.go b/app/suite_test.go
index 52a271688b..cdb7e4766c 100644
--- a/app/suite_test.go
+++ b/app/suite_test.go
@@ -100,7 +100,6 @@ func (s *S) SetUpSuite(c *C) {
 func (s *S) TearDownSuite(c *C) {
 	defer s.t.S3Server.Quit()
 	defer s.t.IamServer.Quit()
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 	fsystem = nil
 	queue.Preempt()
diff --git a/auth/suite_test.go b/auth/suite_test.go
index 19a4cd012c..4753a35ee3 100644
--- a/auth/suite_test.go
+++ b/auth/suite_test.go
@@ -84,7 +84,6 @@ func (s *S) SetUpSuite(c *C) {
 }
 
 func (s *S) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/collector/bench_test.go b/collector/bench_test.go
index e7580b4768..73d60453a0 100644
--- a/collector/bench_test.go
+++ b/collector/bench_test.go
@@ -56,7 +56,6 @@ func BenchmarkUpdate(b *testing.B) {
 	if err != nil {
 		panic(err)
 	}
-	defer conn.Close()
 	defer conn.Apps().Database.DropDatabase()
 	_, names := getFakeApps(conn)
 	app.Provisioner = ttesting.NewFakeProvisioner()
diff --git a/collector/suite_test.go b/collector/suite_test.go
index 79cbe601dd..411e560468 100644
--- a/collector/suite_test.go
+++ b/collector/suite_test.go
@@ -35,7 +35,6 @@ func (s *S) SetUpSuite(c *C) {
 
 func (s *S) TearDownSuite(c *C) {
 	s.conn.Apps().Database.DropDatabase()
-	s.conn.Close()
 }
 
 func (s *S) TearDownTest(c *C) {
diff --git a/db/storage.go b/db/storage.go
index 8bd5e4f50a..51ac5f90de 100644
--- a/db/storage.go
+++ b/db/storage.go
@@ -81,21 +81,6 @@ func Conn() (storage *Storage, err error) {
 	return Open(url, dbname)
 }
 
-// Close closes the connection.
-//
-// You can take advantage of defer statement, and write code that look like this:
-//
-//     st, err := Open("localhost:27017", "tsuru")
-//     if err != nil {
-//         panic(err)
-//     }
-//     defer st.Close()
-//
-// TODO(fss): remove this method and implement a "connection collector".
-func (s *Storage) Close() {
-	s.session.Close()
-}
-
 // Collection returns a collection by its name.
 //
 // If the collection does not exist, MongoDB will create it.
diff --git a/db/storage_test.go b/db/storage_test.go
index 3c559fcd24..ed3f3ae94f 100644
--- a/db/storage_test.go
+++ b/db/storage_test.go
@@ -50,7 +50,7 @@ var _ = Suite(&S{})
 func (s *S) TearDownSuite(c *C) {
 	storage, err := Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
-	defer storage.Close()
+	defer storage.session.Close()
 	storage.session.DB("tsuru_storage_test").DropDatabase()
 }
 
@@ -61,21 +61,21 @@ func (s *S) TearDownTest(c *C) {
 func (s *S) TestOpenConnectsToTheDatabase(c *C) {
 	storage, err := Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
-	defer storage.Close()
+	defer storage.session.Close()
 	c.Assert(storage.session.Ping(), IsNil)
 }
 
 func (s *S) TestOpenStoresConnectionInThePool(c *C) {
 	storage, err := Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
-	defer storage.Close()
+	defer storage.session.Close()
 	c.Assert(storage.session, Equals, conn["127.0.0.1:27017"])
 }
 
 func (s *S) TestOpenReusesConnection(c *C) {
 	storage, err := Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
-	defer storage.Close()
+	defer storage.session.Close()
 	storage2, err := Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
 	c.Assert(storage.session, Equals, storage2.session)
@@ -84,7 +84,7 @@ func (s *S) TestOpenReusesConnection(c *C) {
 func (s *S) TestOpenReconnects(c *C) {
 	storage, err := Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
-	storage.Close()
+	storage.session.Close()
 	storage, err = Open("127.0.0.1:27017", "tsuru_storage_test")
 	c.Assert(err, IsNil)
 	err = storage.session.Ping()
@@ -104,7 +104,7 @@ func (s *S) TestConn(c *C) {
 	defer config.Unset("database:name")
 	storage, err := Conn()
 	c.Assert(err, IsNil)
-	defer storage.Close()
+	defer storage.session.Close()
 	err = storage.session.Ping()
 	c.Assert(err, IsNil)
 }
@@ -125,35 +125,16 @@ func (s *S) TestConnMissingDatabaseName(c *C) {
 	c.Assert(err.Error(), Equals, `configuration error: key "database:name" not found`)
 }
 
-func (s *S) TestCloseClosesTheConnectionWithMongoDB(c *C) {
-	defer func() {
-		if r := recover(); r == nil {
-			c.Errorf("Should close the connection.")
-		}
-	}()
-	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	storage.Close()
-	err := storage.session.Ping()
-	c.Assert(err, NotNil)
-}
-
-func (s *S) TestCloseKeepsTheConnectionInThePool(c *C) {
-	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	storage.Close()
-	_, ok := conn["127.0.0.1:27017"]
-	c.Assert(ok, Equals, true)
-}
-
 func (s *S) TestCollection(c *C) {
 	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	defer storage.Close()
+	defer storage.session.Close()
 	collection := storage.Collection("users")
 	c.Assert(collection.FullName, Equals, storage.dbname+".users")
 }
 
 func (s *S) TestUsers(c *C) {
 	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	defer storage.Close()
+	defer storage.session.Close()
 	users := storage.Users()
 	usersc := storage.Collection("users")
 	c.Assert(users, DeepEquals, usersc)
@@ -162,7 +143,7 @@ func (s *S) TestUsers(c *C) {
 
 func (s *S) TestApps(c *C) {
 	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	defer storage.Close()
+	defer storage.session.Close()
 	apps := storage.Apps()
 	appsc := storage.Collection("apps")
 	c.Assert(apps, DeepEquals, appsc)
@@ -171,7 +152,7 @@ func (s *S) TestApps(c *C) {
 
 func (s *S) TestServices(c *C) {
 	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	defer storage.Close()
+	defer storage.session.Close()
 	services := storage.Services()
 	servicesc := storage.Collection("services")
 	c.Assert(services, DeepEquals, servicesc)
@@ -179,7 +160,7 @@ func (s *S) TestServices(c *C) {
 
 func (s *S) TestServiceInstances(c *C) {
 	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	defer storage.Close()
+	defer storage.session.Close()
 	serviceInstances := storage.ServiceInstances()
 	serviceInstancesc := storage.Collection("service_instances")
 	c.Assert(serviceInstances, DeepEquals, serviceInstancesc)
@@ -187,7 +168,7 @@ func (s *S) TestServiceInstances(c *C) {
 
 func (s *S) TestMethodTeamsShouldReturnTeamsCollection(c *C) {
 	storage, _ := Open("127.0.0.1:27017", "tsuru_storage_test")
-	defer storage.Close()
+	defer storage.session.Close()
 	teams := storage.Teams()
 	teamsc := storage.Collection("teams")
 	c.Assert(teams, DeepEquals, teamsc)
diff --git a/provision/juju/elb_test.go b/provision/juju/elb_test.go
index 57484997e3..f440438080 100644
--- a/provision/juju/elb_test.go
+++ b/provision/juju/elb_test.go
@@ -55,7 +55,6 @@ func (s *ELBSuite) SetUpSuite(c *C) {
 func (s *ELBSuite) TearDownSuite(c *C) {
 	config.Unset("juju:use-elb")
 	s.conn.Collection("juju_units_test_elb").Database.DropDatabase()
-	s.conn.Close()
 	s.server.Quit()
 	handler.Stop()
 	handler.Wait()
diff --git a/provision/juju/suite_test.go b/provision/juju/suite_test.go
index b0d7e8f6d3..6d8a685da8 100644
--- a/provision/juju/suite_test.go
+++ b/provision/juju/suite_test.go
@@ -36,5 +36,4 @@ func (s *S) TearDownSuite(c *C) {
 	handler.Stop()
 	handler.Wait()
 	s.conn.Collection(s.collName).Database.DropDatabase()
-	s.conn.Close()
 }
diff --git a/service/bind/bind_test.go b/service/bind/bind_test.go
index 2fecf11510..00636af0b9 100644
--- a/service/bind/bind_test.go
+++ b/service/bind/bind_test.go
@@ -47,7 +47,6 @@ func (s *S) SetUpSuite(c *C) {
 }
 
 func (s *S) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }
 
diff --git a/service/suite_test.go b/service/suite_test.go
index 5e02f6d3e7..edd71799df 100644
--- a/service/suite_test.go
+++ b/service/suite_test.go
@@ -69,7 +69,6 @@ func (s *S) SetUpSuite(c *C) {
 }
 
 func (s *S) TearDownSuite(c *C) {
-	defer s.conn.Close()
 	s.conn.Apps().Database.DropDatabase()
 }