diff --git a/lib/connection.js b/lib/connection.js
index 8b6718da664..5d7b22b990d 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -992,15 +992,8 @@ function _setClient(conn, client, options, dbName) {
 
   delete conn.then;
   delete conn.catch;
-  conn.readyState = STATES.connected;
-
-  for (const i in conn.collections) {
-    if (utils.object.hasOwnProperty(conn.collections, i)) {
-      conn.collections[i].onOpen();
-    }
-  }
-
-  conn.emit('open');
+  
+  conn.onOpen();
 }
 
 /*!
diff --git a/test/collection.capped.test.js b/test/collection.capped.test.js
index a0270fa47a2..53def94437b 100644
--- a/test/collection.capped.test.js
+++ b/test/collection.capped.test.js
@@ -37,7 +37,7 @@ describe('collections: capped:', function() {
   });
 
   it('creation', function() {
-    this.timeout(30000);
+    this.timeout(15000);
 
     return co(function*() {
       yield db.dropCollection('Test').catch(() => {});