diff --git a/test_storage.py b/test_storage.py
index 7ad5331..0ce21cc 100644
--- a/test_storage.py
+++ b/test_storage.py
@@ -1,53 +1,56 @@
 # Copyright (C) 2015  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 shutil
 import tempfile
 import unittest
 
 from nose.tools import istest
 from nose.plugins.attrib import attr
 
 from .db_testing import DbTestFixture
-from swh.core import hashutil
+from swh.core.hashutil import hex_to_hash
 from swh.storage import Storage
 
 
 @attr('db')
 class TestStorage(DbTestFixture, unittest.TestCase):
 
     def setUp(self):
         super().setUp()
         self.objroot = tempfile.mkdtemp()
         self.storage = Storage(self.conn, self.objroot)
 
-    def tearDown(self):
-        shutil.rmtree(self.objroot)
-        super().tearDown()
-
-    @istest
-    def content_add(self):
-        cont = {
+        self.cont = {
             'data': b'42\n',
             'length': 3,
-            'sha1': hashutil.hex_to_hash(
+            'sha1': hex_to_hash(
                 '34973274ccef6ab4dfaaf86599792fa9c3fe4689'),
-            'sha1_git': hashutil.hex_to_hash(
+            'sha1_git': hex_to_hash(
                 'd81cc0710eb6cf9efd5b920a8453e1e07157b6cd'),
-            'sha256': hashutil.hex_to_hash(
+            'sha256': hex_to_hash(
                 '673650f936cb3b0a2f93ce09d81be107'
-                '48b1b203c19e8176b4eefc1964a0cf3a')
+                '48b1b203c19e8176b4eefc1964a0cf3a'),
         }
+
+    def tearDown(self):
+        shutil.rmtree(self.objroot)
+        super().tearDown()
+
+    @istest
+    def content_add(self):
+        cont = self.cont
+
         self.storage.content_add([cont])
         self.assertIn(cont['sha1'], self.storage.objstorage)
         self.cursor.execute('SELECT sha1, sha1_git, sha256, length, status'
                             ' FROM content WHERE sha1 = %s',
                             (cont['sha1'],))
         datum = self.cursor.fetchone()
         self.assertEqual(
             (datum[0].tobytes(), datum[1].tobytes(), datum[2].tobytes(),
              datum[3], datum[4]),
             (cont['sha1'], cont['sha1_git'], cont['sha256'],
              cont['length'], 'visible'))