diff --git a/tests/conftest.py b/tests/conftest.py
index cac2a3b..c1bb7d8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -33,6 +33,8 @@ def tmpdir(tmpdir_factory, request):
     """Create a tmp dir for the tests"""
     base = str(hash(request.node.nodeid))[:3]
     bn = tmpdir_factory.mktemp(base)
+    import os
+    os.environ["HOME"] = str(bn)
     return bn
 
 
diff --git a/tests/test_identity.py b/tests/test_identity.py
index 59fdcb9..03829d0 100644
--- a/tests/test_identity.py
+++ b/tests/test_identity.py
@@ -5,8 +5,6 @@ from . import constants
 
 
 def test_create_one_identity_succeed(tmpdir):
-    # Change $HOME before initializing the db
-    os.environ["HOME"] = str(tmpdir)
     # It has to be imported here to get the management db initialized,
     import pEp
     alice = pEp.Identity()