diff --git a/tests/Model/BSONArrayTest.php b/tests/Model/BSONArrayTest.php
index 9f4191e79..c01bd0ced 100644
--- a/tests/Model/BSONArrayTest.php
+++ b/tests/Model/BSONArrayTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
+use MongoDB\Tests\TestCase;
 
 class BSONArrayTest extends TestCase
 {
diff --git a/tests/Model/BSONDocumentTest.php b/tests/Model/BSONDocumentTest.php
index 2f13e2fba..0924a0b0e 100644
--- a/tests/Model/BSONDocumentTest.php
+++ b/tests/Model/BSONDocumentTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
+use MongoDB\Tests\TestCase;
 use ArrayObject;
 
 class BSONDocumentTest extends TestCase
diff --git a/tests/Model/CollectionInfoTest.php b/tests/Model/CollectionInfoTest.php
index 4cef402b8..f5f053225 100644
--- a/tests/Model/CollectionInfoTest.php
+++ b/tests/Model/CollectionInfoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\CollectionInfo;
 use MongoDB\Tests\TestCase;
diff --git a/tests/Model/DatabaseInfoTest.php b/tests/Model/DatabaseInfoTest.php
index 3e779c2d3..afce8a5a6 100644
--- a/tests/Model/DatabaseInfoTest.php
+++ b/tests/Model/DatabaseInfoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\DatabaseInfo;
 use MongoDB\Tests\TestCase;
diff --git a/tests/Model/IndexInfoTest.php b/tests/Model/IndexInfoTest.php
index 2ebbf310b..690ed0c81 100644
--- a/tests/Model/IndexInfoTest.php
+++ b/tests/Model/IndexInfoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\IndexInfo;
 use MongoDB\Tests\TestCase;
diff --git a/tests/Model/IndexInputTest.php b/tests/Model/IndexInputTest.php
index 35df36c31..076bdb018 100644
--- a/tests/Model/IndexInputTest.php
+++ b/tests/Model/IndexInputTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\IndexInput;
 use MongoDB\Tests\TestCase;
diff --git a/tests/Model/TypeMapArrayIteratorTest.php b/tests/Model/TypeMapArrayIteratorTest.php
index e15061bb3..47d075cfb 100644
--- a/tests/Model/TypeMapArrayIteratorTest.php
+++ b/tests/Model/TypeMapArrayIteratorTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\TypeMapArrayIterator;
+use MongoDB\Tests\TestCase;
 
 class TypeMapArrayIteratorTest extends TestCase
 {
diff --git a/tests/Operation/BulkWriteFunctionalTest.php b/tests/Operation/BulkWriteFunctionalTest.php
index cbd5aace0..234a4956d 100644
--- a/tests/Operation/BulkWriteFunctionalTest.php
+++ b/tests/Operation/BulkWriteFunctionalTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
 use MongoDB\BulkWriteResult;
+use MongoDB\Collection;
 use MongoDB\Driver\BulkWrite as Bulk;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONDocument;
@@ -10,12 +11,14 @@
 
 class BulkWriteFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
     private $omitModifiedCount;
 
     public function setUp()
     {
         parent::setUp();
 
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
         $this->omitModifiedCount = version_compare($this->getServerVersion(), '2.6.0', '<');
     }
 
diff --git a/tests/Operation/DeleteFunctionalTest.php b/tests/Operation/DeleteFunctionalTest.php
index 588083f1d..b76a4b819 100644
--- a/tests/Operation/DeleteFunctionalTest.php
+++ b/tests/Operation/DeleteFunctionalTest.php
@@ -1,14 +1,24 @@
 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
 use MongoDB\DeleteResult;
+use MongoDB\Collection;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Operation\Delete;
 
 class DeleteFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
     public function testDeleteOne()
     {
         $this->createFixtures(3);
diff --git a/tests/Operation/InsertManyFunctionalTest.php b/tests/Operation/InsertManyFunctionalTest.php
index fb7a535ef..902338cfd 100644
--- a/tests/Operation/InsertManyFunctionalTest.php
+++ b/tests/Operation/InsertManyFunctionalTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
+use MongoDB\Collection;
 use MongoDB\InsertManyResult;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONDocument;
@@ -9,6 +10,15 @@
 
 class InsertManyFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
     public function testInsertMany()
     {
         $documents = [
diff --git a/tests/Operation/InsertOneFunctionalTest.php b/tests/Operation/InsertOneFunctionalTest.php
index f7f362cd9..7accb7f6b 100644
--- a/tests/Operation/InsertOneFunctionalTest.php
+++ b/tests/Operation/InsertOneFunctionalTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
+use MongoDB\Collection;
 use MongoDB\InsertOneResult;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONDocument;
@@ -9,6 +10,15 @@
 
 class InsertOneFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
     /**
      * @dataProvider provideDocumentWithExistingId
      */
diff --git a/tests/Operation/UpdateFunctionalTest.php b/tests/Operation/UpdateFunctionalTest.php
index 1a5013a39..20f300fb4 100644
--- a/tests/Operation/UpdateFunctionalTest.php
+++ b/tests/Operation/UpdateFunctionalTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
+use MongoDB\Collection;
 use MongoDB\UpdateResult;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\WriteConcern;
@@ -9,12 +10,14 @@
 
 class UpdateFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
     private $omitModifiedCount;
 
     public function setUp()
     {
         parent::setUp();
 
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
         $this->omitModifiedCount = version_compare($this->getServerVersion(), '2.6.0', '<');
     }