diff --git a/migrate_source_csv/tests/src/Unit/CSVFileObjectTest.php b/migrate_source_csv/tests/src/Unit/CSVFileObjectTest.php
index c5eb16a..2392aa9 100644
--- a/migrate_source_csv/tests/src/Unit/CSVFileObjectTest.php
+++ b/migrate_source_csv/tests/src/Unit/CSVFileObjectTest.php
@@ -18,6 +18,16 @@ use org\bovigo\vfs\content\LargeFileContent;
 class CSVFileObjectTest extends CSVUnitTestCase {
 
   /**
+   * @var \Drupal\migrate_source_csv\CSVFileObject CSV file object.
+   */
+  protected $csv_file_object;
+
+  protected function setUp() {
+    parent::setUp();
+    $this->csv_file_object = new CSVFileObject($this->happyPath);
+  }
+
+  /**
    * Tests that the construction appropriately creates a CSVFileObject.
    *
    * @test
@@ -25,10 +35,23 @@ class CSVFileObjectTest extends CSVUnitTestCase {
    * @covers ::__construct
    */
   public function create() {
-    $csv_file_object = new CSVFileObject($this->happyPath);
-    $this->assertInstanceOf('\Drupal\migrate_source_csv\CSVFileObject', $csv_file_object);
+    $this->assertInstanceOf(CSVFileObject::class, $this->csv_file_object);
     $flags = CSVFileObject::READ_CSV | CSVFileObject::READ_AHEAD | CSVFileObject::DROP_NEW_LINE | CSVFileObject::SKIP_EMPTY;
-    $this->assertEquals($flags, $csv_file_object->getFlags());
+    $this->assertSame($flags, $this->csv_file_object->getFlags());
+  }
+
+  /**
+   * Tests that the header row count is correctly set.
+   *
+   * @test
+   *
+   * @covers ::setHeaderRowCount
+   */
+  public function setHeaderRowCount() {
+    $expected = 2;
+    $this->csv_file_object->setHeaderRowCount($expected);
+
+    return $this->csv_file_object->getHeaderRowCount();
   }
 
   /**
@@ -36,15 +59,12 @@ class CSVFileObjectTest extends CSVUnitTestCase {
    *
    * @test
    *
+   * @depends setHeaderRowCount
+   *
    * @covers ::getHeaderRowCount
-   * @covers ::setHeaderRowCount
    */
-  public function headerRowCount() {
-    $csv_file_object = new CSVFileObject($this->happyPath);
-    $expected = 1;
-    $csv_file_object->setHeaderRowCount($expected);
-    $actual = $csv_file_object->getHeaderRowCount();
-
+  public function getHeaderRowCount($actual) {
+    $expected = 2;
     $this->assertEquals($expected, $actual);
   }
 
@@ -56,10 +76,9 @@ class CSVFileObjectTest extends CSVUnitTestCase {
    * @covers ::count
    */
   public function countLines() {
-    $csv_file_object = new CSVFileObject($this->happyPath);
     $expected = 15;
-    $csv_file_object->setHeaderRowCount(1);
-    $actual = $csv_file_object->count();
+    $this->csv_file_object->setHeaderRowCount(1);
+    $actual = $this->csv_file_object->count();
 
     $this->assertEquals($expected, $actual);
   }
@@ -75,7 +94,6 @@ class CSVFileObjectTest extends CSVUnitTestCase {
    * @covers ::setColumnNames
    */
   public function current() {
-    $csv_file_object = new CSVFileObject($this->happyPath);
     $column_names = array(
       array('id' => 'Identifier'),
       array('first_name' => 'First Name'),
@@ -97,6 +115,7 @@ class CSVFileObjectTest extends CSVUnitTestCase {
       '60.242.130.40',
     );
 
+    $csv_file_object = $this->csv_file_object;
     $csv_file_object->rewind();
     $current = $csv_file_object->current();
     $this->assertArrayEquals($columns, $current);