diff --git a/tests/Gaufrette/Functional/Adapter/AzureMultiContainerBlobStorageTest.php b/tests/Gaufrette/Functional/Adapter/AzureMultiContainerBlobStorageTest.php
index 10d349dda..8fba0dad0 100644
--- a/tests/Gaufrette/Functional/Adapter/AzureMultiContainerBlobStorageTest.php
+++ b/tests/Gaufrette/Functional/Adapter/AzureMultiContainerBlobStorageTest.php
@@ -206,7 +206,7 @@ public function shouldKeepFileObjectInRegister()
         $FileObjectA = $this->filesystem->createFile($path);
         $FileObjectB = $this->filesystem->createFile($path);
 
-        $this->assertTrue($FileObjectA === $FileObjectB);
+        $this->assertSame($FileObjectB, $FileObjectA);
     }
 
     /**
diff --git a/tests/Gaufrette/Functional/Adapter/LocalTest.php b/tests/Gaufrette/Functional/Adapter/LocalTest.php
index c1947f96b..7dbd9d27b 100644
--- a/tests/Gaufrette/Functional/Adapter/LocalTest.php
+++ b/tests/Gaufrette/Functional/Adapter/LocalTest.php
@@ -160,7 +160,7 @@ public function shouldBeAbleToClearCache()
         $this->filesystem->clearFileRegister();
         $fsRegister = $fsReflection->getProperty('fileRegister');
         $fsRegister->setAccessible(true);
-        $this->assertEquals(0, count($fsRegister->getValue($this->filesystem)));
+        $this->assertCount(0, $fsRegister->getValue($this->filesystem));
 
         $this->filesystem->delete('test.txt');
         $this->filesystem->delete('test2.txt');
diff --git a/tests/Gaufrette/Functional/FileStream/FunctionalTestCase.php b/tests/Gaufrette/Functional/FileStream/FunctionalTestCase.php
index 7575da3b8..78b329a10 100644
--- a/tests/Gaufrette/Functional/FileStream/FunctionalTestCase.php
+++ b/tests/Gaufrette/Functional/FileStream/FunctionalTestCase.php
@@ -26,10 +26,10 @@ public function shouldCheckIsFile()
     public function shouldCheckFileExists()
     {
         $this->filesystem->write('test.txt', 'some content');
-        $this->assertTrue(file_exists('gaufrette://filestream/test.txt'));
+        $this->assertFileExists('gaufrette://filestream/test.txt');
 
         $this->filesystem->delete('test.txt');
-        $this->assertFalse(file_exists('gaufrette://filestream/test.txt'));
+        $this->assertFileNotExists('gaufrette://filestream/test.txt');
     }
 
     /**
@@ -201,7 +201,7 @@ public function shouldCopyFile()
     public function shouldCreateNewFile($mode)
     {
         $fileHandler = fopen('gaufrette://filestream/test.txt', $mode);
-        $this->assertTrue(file_exists('gaufrette://filestream/test.txt'));
+        $this->assertFileExists('gaufrette://filestream/test.txt');
     }
 
     public static function modesProvider()
diff --git a/tests/Gaufrette/Functional/FileStream/LocalTest.php b/tests/Gaufrette/Functional/FileStream/LocalTest.php
index f52641f88..4837bedc7 100644
--- a/tests/Gaufrette/Functional/FileStream/LocalTest.php
+++ b/tests/Gaufrette/Functional/FileStream/LocalTest.php
@@ -44,6 +44,6 @@ public function tearDown()
     public function shouldSupportsDirectory()
     {
         $this->assertFileExists('gaufrette://filestream/subdir');
-        $this->assertTrue(is_dir('gaufrette://filestream/subdir'));
+        $this->assertDirectoryExists('gaufrette://filestream/subdir');
     }
 }