diff --git a/Makefile b/Makefile
index b4942d832..180d2f512 100644
--- a/Makefile
+++ b/Makefile
@@ -53,13 +53,13 @@ docker.php-cs-fix: ## Run CS fixer
 # -------
 #
 
-remove-phpspec: ## Remove adapter specs (allows you to run test suite without adapters deps)
+remove-phpspec: ## Remove adapter specs (allows you to run test suite without adapters that needs deps)
 	rm spec/Gaufrette/Adapter/AsyncAwsS3Spec.php
 	rm spec/Gaufrette/Adapter/AwsS3Spec.php
-	rm spec/Gaufrette/Adapter/GoogleCloudStorageSpec.php
+	rm spec/Gaufrette/Adapter/AzureBlobStorageSpec.php
 	rm spec/Gaufrette/Adapter/DoctrineDbalSpec.php
 	rm spec/Gaufrette/Adapter/FlysystemSpec.php
-	rm -r spec/Gaufrette/Adapter/AzureBlobStorage
+	rm spec/Gaufrette/Adapter/GoogleCloudStorageSpec.php
 	rm spec/Gaufrette/Adapter/GridFSSpec.php
 	rm spec/Gaufrette/Adapter/PhpseclibSftpSpec.php
 
diff --git a/spec/Gaufrette/Adapter/AzureBlobStorage.php b/spec/Gaufrette/Adapter/AzureBlobStorageSpec.php
similarity index 99%
rename from spec/Gaufrette/Adapter/AzureBlobStorage.php
rename to spec/Gaufrette/Adapter/AzureBlobStorageSpec.php
index c6cee8572..977cdcf56 100644
--- a/spec/Gaufrette/Adapter/AzureBlobStorage.php
+++ b/spec/Gaufrette/Adapter/AzureBlobStorageSpec.php
@@ -7,7 +7,7 @@
 use WindowsAzure\Blob\Models\Blob;
 use WindowsAzure\Common\ServiceException;
 
-class AzureBlobStorage extends ObjectBehavior
+class AzureBlobStorageSpec extends ObjectBehavior
 {
     /**
      * @param \Gaufrette\Adapter\AzureBlobStorage\BlobProxyFactoryInterface $blobProxyFactory
diff --git a/spec/Gaufrette/Adapter/ZipSpec.php b/spec/Gaufrette/Adapter/ZipSpec.php
deleted file mode 100644
index 76bb1c13a..000000000
--- a/spec/Gaufrette/Adapter/ZipSpec.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace spec\Gaufrette\Adapter;
-
-use PhpSpec\ObjectBehavior;
-
-class ZipSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('somefile');
-    }
-
-    function it_is_adapter()
-    {
-        $this->shouldHaveType('Gaufrette\Adapter');
-    }
-}