diff --git a/swh/objstorage/tests/test_objstorage_cloud.py b/swh/objstorage/tests/test_objstorage_cloud.py
index 086aa6e..54de3b7 100644
--- a/swh/objstorage/tests/test_objstorage_cloud.py
+++ b/swh/objstorage/tests/test_objstorage_cloud.py
@@ -1,166 +1,126 @@
 # Copyright (C) 2016  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import unittest
-import bz2
-import lzma
-import zlib
 
 from libcloud.common.types import InvalidCredsError
 from libcloud.storage.types import (ContainerDoesNotExistError,
                                     ObjectDoesNotExistError)
+from typing import Optional
+
 from swh.model import hashutil
+
+from swh.objstorage.objstorage import decompressors
 from swh.objstorage.backends.libcloud import CloudObjStorage
 
 from .objstorage_testing import ObjStorageTestFixture
 
 API_KEY = 'API_KEY'
 API_SECRET_KEY = 'API SECRET KEY'
 CONTAINER_NAME = 'test_container'
 
 
 class MockLibcloudObject():
     """ Libcloud object mock that replicates its API """
     def __init__(self, name, content):
         self.name = name
         self.content = list(content)
 
     def as_stream(self):
         yield from iter(self.content)
 
 
 class MockLibcloudDriver():
     """ Mock driver that replicates the used LibCloud API """
     def __init__(self, api_key, api_secret_key):
         self.containers = {CONTAINER_NAME: {}}  # Storage is initialized
         self.api_key = api_key
         self.api_secret_key = api_secret_key
 
     def _check_credentials(self):
         # Private method may be known as another name in Libcloud but is used
         # to replicate libcloud behavior (i.e. check credential at each
         # request)
         if self.api_key != API_KEY or self.api_secret_key != API_SECRET_KEY:
             raise InvalidCredsError()
 
     def get_container(self, container_name):
         try:
             return self.containers[container_name]
         except KeyError:
             raise ContainerDoesNotExistError(container_name=container_name,
                                              driver=self, value=None)
 
     def iterate_container_objects(self, container):
         self._check_credentials()
         yield from (v for k, v in sorted(container.items()))
 
     def get_object(self, container_name, obj_id):
         self._check_credentials()
         try:
             container = self.get_container(container_name)
             return container[obj_id]
         except KeyError:
             raise ObjectDoesNotExistError(object_name=obj_id,
                                           driver=self, value=None)
 
     def delete_object(self, obj):
         self._check_credentials()
         try:
             container = self.get_container(CONTAINER_NAME)
             container.pop(obj.name)
             return True
         except KeyError:
             raise ObjectDoesNotExistError(object_name=obj.name,
                                           driver=self, value=None)
 
     def upload_object_via_stream(self, content, container, obj_id):
         self._check_credentials()
         obj = MockLibcloudObject(obj_id, content)
         container[obj_id] = obj
 
 
 class MockCloudObjStorage(CloudObjStorage):
     """ Cloud object storage that uses a mocked driver """
     def _get_driver(self, **kwargs):
         return MockLibcloudDriver(**kwargs)
 
     def _get_provider(self):
         # Implement this for the abc requirement, but behavior is defined in
         # _get_driver.
         pass
 
 
 class TestCloudObjStorage(ObjStorageTestFixture, unittest.TestCase):
+    compression = None  # type: Optional[str]
 
     def setUp(self):
         super().setUp()
         self.storage = MockCloudObjStorage(
             CONTAINER_NAME,
             api_key=API_KEY, api_secret_key=API_SECRET_KEY,
+            compression=self.compression,
         )
 
     def test_compression(self):
         content, obj_id = self.hash_content(b'add_get_w_id')
         self.storage.add(content, obj_id=obj_id)
         data = self.storage.driver.containers[CONTAINER_NAME]
         obj_id = hashutil.hash_to_hex(obj_id)
-        self.assertEqual(b''.join(data[obj_id].content), content)
-
-
-class TestCloudObjStorageBz2(ObjStorageTestFixture, unittest.TestCase):
-
-    def setUp(self):
-        super().setUp()
-        self.storage = MockCloudObjStorage(
-            CONTAINER_NAME,
-            compression='bz2',
-            api_key=API_KEY, api_secret_key=API_SECRET_KEY,
-        )
-
-    def test_compression(self):
-        content, obj_id = self.hash_content(b'add_get_w_id')
-        self.storage.add(content, obj_id=obj_id)
-        data = self.storage.driver.containers[CONTAINER_NAME]
-        obj_id = hashutil.hash_to_hex(obj_id)
-        self.assertEqual(bz2.decompress(b''.join(data[obj_id].content)),
-                         content)
-
+        raw_content = b''.join(data[obj_id].content)
 
-class TestCloudObjStorageLzma(ObjStorageTestFixture, unittest.TestCase):
+        assert decompressors[self.compression](raw_content) == content
 
-    def setUp(self):
-        super().setUp()
-        self.storage = MockCloudObjStorage(
-            CONTAINER_NAME,
-            compression='lzma',
-            api_key=API_KEY, api_secret_key=API_SECRET_KEY,
-        )
 
-    def test_compression(self):
-        content, obj_id = self.hash_content(b'add_get_w_id')
-        self.storage.add(content, obj_id=obj_id)
-        data = self.storage.driver.containers[CONTAINER_NAME]
-        obj_id = hashutil.hash_to_hex(obj_id)
-        self.assertEqual(lzma.decompress(b''.join(data[obj_id].content)),
-                         content)
+class TestCloudObjStorageBz2(TestCloudObjStorage):
+    compression = 'bz2'
 
 
-class TestCloudObjStorageZlib(ObjStorageTestFixture, unittest.TestCase):
+class TestCloudObjStorageLzma(TestCloudObjStorage):
+    compression = 'lzma'
 
-    def setUp(self):
-        super().setUp()
-        self.storage = MockCloudObjStorage(
-            CONTAINER_NAME,
-            compression='zlib',
-            api_key=API_KEY, api_secret_key=API_SECRET_KEY,
-        )
 
-    def test_compression(self):
-        content, obj_id = self.hash_content(b'add_get_w_id')
-        self.storage.add(content, obj_id=obj_id)
-        data = self.storage.driver.containers[CONTAINER_NAME]
-        obj_id = hashutil.hash_to_hex(obj_id)
-        self.assertEqual(zlib.decompress(b''.join(data[obj_id].content)),
-                         content)
+class TestCloudObjStorageZlib(TestCloudObjStorage):
+    compression = 'zlib'