diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
index b65f8cb8..8a92c8ad 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
@@ -127,7 +127,7 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
 
         $result = $this->testAutoFilterColumnObject->getAttributes();
         $this->assertInternalType('array', $result);
-        $this->assertEquals(count($attributeSet), count($result));
+        $this->assertCount(count($attributeSet), $result);
     }
 
     public function testSetAttribute()
diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php
index bead23ea..6850b2fe 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php
@@ -106,7 +106,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase
         //  There should be no columns yet defined
         $result = $this->testAutoFilterObject->getColumns();
         $this->assertInternalType('array', $result);
-        $this->assertEquals(0, count($result));
+        $this->assertCount(0, $result);
     }
 
     public function testGetColumnOffset()
@@ -147,7 +147,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase
         //  Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column
         //    objects for each column we set indexed by the column ID
         $this->assertInternalType('array', $result);
-        $this->assertEquals(1, count($result));
+        $this->assertCount(1, $result);
         $this->assertArrayHasKey($expectedResult, $result);
         $this->assertInstanceOf(Column::class, $result[$expectedResult]);
     }
@@ -175,7 +175,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase
         //  Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column
         //    objects for each column we set indexed by the column ID
         $this->assertInternalType('array', $result);
-        $this->assertEquals(1, count($result));
+        $this->assertCount(1, $result);
         $this->assertArrayHasKey($expectedResult, $result);
         $this->assertInstanceOf(Column::class, $result[$expectedResult]);
     }
@@ -214,7 +214,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase
         //  Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column
         //    objects for each column we set indexed by the column ID
         $this->assertInternalType('array', $result);
-        $this->assertEquals(count($columnIndexes), count($result));
+        $this->assertCount(count($columnIndexes), $result);
         foreach ($columnIndexes as $columnIndex) {
             $this->assertArrayHasKey($columnIndex, $result);
             $this->assertInstanceOf(Column::class, $result[$columnIndex]);
@@ -292,7 +292,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase
         //  Column array should be cleared
         $result = $this->testAutoFilterObject->getColumns();
         $this->assertInternalType('array', $result);
-        $this->assertEquals(0, count($result));
+        $this->assertCount(0, $result);
     }
 
     public function testSetRangeWithExistingColumns()
@@ -322,7 +322,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase
         //    still fall within the new range should be retained
         $result = $this->testAutoFilterObject->getColumns();
         $this->assertInternalType('array', $result);
-        $this->assertEquals(count($columnIndexes1), count($result));
+        $this->assertCount(count($columnIndexes1), $result);
     }
 
     public function testClone()