diff --git a/Tools/GitEntityResolver/python/GitCondDB/tests/test_iovs.py b/Tools/GitEntityResolver/python/GitCondDB/tests/test_iovs.py
index 50746e565889495c729c909d263bdc5cda2c788b..c7d288e2dba625894d9c113ab5ddd26375e39e73 100644
--- a/Tools/GitEntityResolver/python/GitCondDB/tests/test_iovs.py
+++ b/Tools/GitEntityResolver/python/GitCondDB/tests/test_iovs.py
@@ -10,21 +10,11 @@
 ###############################################################################
 import itertools
 import os
-from contextlib import contextmanager
+from contextlib import chdir
 
 from GitCondDB import IOVs as I
 
 
-@contextmanager
-def chdir(path):
-    old = os.getcwd()
-    os.chdir(path)
-    try:
-        yield
-    finally:
-        os.chdir(old)
-
-
 def make_entries(iterable):
     output = []
     for data in iterable: