diff --git a/tests/basic_env.py b/tests/basic_env.py
index 786386318..af14066f1 100644
--- a/tests/basic_env.py
+++ b/tests/basic_env.py
@@ -21,7 +21,7 @@ from dvc.utils.fs import remove
 logger = logging.getLogger("dvc")
 
 
-class TestDirFixtureBase(object):
+class EmptyDirFixture(object):
     def __init__(self):
         root_dir = self.mkdtemp()
         self._root_dir = os.path.realpath(root_dir)
@@ -69,7 +69,7 @@ class TestDirFixtureBase(object):
                 raise
 
 
-class TestDirFixture(TestDirFixtureBase):
+class TestDirFixture(EmptyDirFixture):
     DATA_DIR = "data_dir"
     DATA_SUB_DIR = os.path.join(DATA_DIR, "data_sub_dir")
     DATA = os.path.join(DATA_DIR, "data")
diff --git a/tests/conftest.py b/tests/conftest.py
index 3f62a1494..082b0948c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,7 +7,7 @@ import pytest
 from git import Repo
 from git.exc import GitCommandNotFound
 
-from .basic_env import TestDirFixture, TestDirFixtureBase
+from .basic_env import TestDirFixture, EmptyDirFixture
 from .basic_env import TestDvcGitFixture
 from .basic_env import TestGitFixture
 from dvc.remote.config import RemoteConfig
@@ -194,7 +194,7 @@ def git_erepo():
 
 @pytest.fixture
 def empty_dir():
-    directory = TestDirFixtureBase()
+    directory = EmptyDirFixture()
     directory.setUp()
     yield directory
     directory.tearDown()