diff --git a/swh/storage/tests/test_api_client.py b/swh/storage/tests/test_api_client.py
index 6c1b7ba18..d6f1e5268 100644
--- a/swh/storage/tests/test_api_client.py
+++ b/swh/storage/tests/test_api_client.py
@@ -1,49 +1,54 @@
 # Copyright (C) 2015-2018  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 shutil
 import tempfile
+import unittest
 
 from swh.core.tests.server_testing import ServerTestFixture
 from swh.storage.tests.test_storage import CommonTestStorage
 from swh.storage.api.client import RemoteStorage
 from swh.storage.api.server import app
 
 
 class TestRemoteStorage(CommonTestStorage, ServerTestFixture,
                         unittest.TestCase):
     """Test the remote storage API.
 
     This class doesn't define any tests as we want identical
     functionality between local and remote storage. All the tests are
     therefore defined in CommonTestStorage.
     """
 
     def setUp(self):
         # ServerTestFixture needs to have self.objroot for
         # setUp() method, but this field is defined in
         # AbstractTestStorage's setUp()
         # To avoid confusion, override the self.objroot to a
         # one chosen in this class.
-        storage_base = tempfile.mkdtemp()
+        self.storage_base = tempfile.mkdtemp()
         self.config = {
             'storage': {
                 'cls': 'local',
                 'args': {
                     'db': 'dbname=%s' % self.TEST_STORAGE_DB_NAME,
                     'objstorage': {
                         'cls': 'pathslicing',
                         'args': {
-                            'root': storage_base,
-                            'slicing': '0:2/2:4/4:6',
+                            'root': self.storage_base,
+                            'slicing': '0:2',
                         },
                     },
                 }
             }
         }
         self.app = app
         super().setUp()
         self.storage = RemoteStorage(self.url())
-        self.objroot = storage_base
+        self.objroot = self.storage_base
+
+    def tearDown(self):
+        super().tearDown()
+        shutil.rmtree(self.storage_base)