diff --git a/tests/__init__.py b/tests/__init__.py
index 19d7ee1d..0ef15d0a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -252,7 +252,8 @@ class PostgresInit(unittest.TestCase):
     @patch.object(ConfigHandler, 'replace_pg_ident', Mock())
     @patch.object(Postgresql, 'get_postgres_role_from_data_directory', Mock(return_value='primary'))
     def setUp(self):
-        data_dir = os.path.join('data', 'test0')
+        self._tmp_dir = 'data'
+        data_dir = os.path.join(self._tmp_dir, 'test0')
         config = {'name': 'postgresql0', 'scope': 'batman', 'data_dir': data_dir,
                   'config_dir': data_dir, 'retry_timeout': 10,
                   'krbsrvname': 'postgres', 'pgpass': os.path.join(data_dir, 'pgpass0'),
@@ -293,3 +294,6 @@ class BaseTestPostgresql(PostgresInit):
     def tearDown(self):
         if os.path.exists(self.p.data_dir):
             shutil.rmtree(self.p.data_dir)
+
+        if not os.listdir(self._tmp_dir):
+            shutil.rmtree(self._tmp_dir)