diff --git a/tests/func/__init__.py b/tests/func/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_add.py b/tests/func/test_add.py
similarity index 100%
rename from tests/test_add.py
rename to tests/func/test_add.py
diff --git a/tests/test_analytics.py b/tests/func/test_analytics.py
similarity index 100%
rename from tests/test_analytics.py
rename to tests/func/test_analytics.py
diff --git a/tests/test_cache.py b/tests/func/test_cache.py
similarity index 100%
rename from tests/test_cache.py
rename to tests/func/test_cache.py
diff --git a/tests/test_checkout.py b/tests/func/test_checkout.py
similarity index 99%
rename from tests/test_checkout.py
rename to tests/func/test_checkout.py
index 6abe2de98..bde04aa4b 100644
--- a/tests/test_checkout.py
+++ b/tests/func/test_checkout.py
@@ -14,7 +14,7 @@ from dvc.repo import Repo as DvcRepo
 from dvc.system import System
 from dvc.utils import walk_files, load_stage_file
 from tests.basic_env import TestDvc
-from tests.test_repro import TestRepro
+from tests.func.test_repro import TestRepro
 from dvc.stage import Stage, StageFileBadNameError, StageFileDoesNotExistError
 from dvc.remote.local import RemoteLOCAL
 from dvc.exceptions import (
diff --git a/tests/test_cli.py b/tests/func/test_cli.py
similarity index 100%
rename from tests/test_cli.py
rename to tests/func/test_cli.py
diff --git a/tests/test_commit.py b/tests/func/test_commit.py
similarity index 100%
rename from tests/test_commit.py
rename to tests/func/test_commit.py
diff --git a/tests/test_config.py b/tests/func/test_config.py
similarity index 100%
rename from tests/test_config.py
rename to tests/func/test_config.py
diff --git a/tests/test_data_cloud.py b/tests/func/test_data_cloud.py
similarity index 100%
rename from tests/test_data_cloud.py
rename to tests/func/test_data_cloud.py
diff --git a/tests/test_dependency.py b/tests/func/test_dependency.py
similarity index 87%
rename from tests/test_dependency.py
rename to tests/func/test_dependency.py
index bed94804d..e1e1385a0 100644
--- a/tests/test_dependency.py
+++ b/tests/func/test_dependency.py
@@ -1,7 +1,7 @@
 from dvc.stage import Stage
 from dvc.dependency import _get, DEP_MAP
 
-from tests.test_output import TestOutScheme
+from tests.func.test_output import TestOutScheme
 
 
 class TestDepScheme(TestOutScheme):
diff --git a/tests/test_destroy.py b/tests/func/test_destroy.py
similarity index 91%
rename from tests/test_destroy.py
rename to tests/func/test_destroy.py
index 07803a6b3..8ec3f0ac6 100644
--- a/tests/test_destroy.py
+++ b/tests/func/test_destroy.py
@@ -2,7 +2,7 @@ import os
 
 from dvc.main import main
 
-from tests.test_repro import TestRepro
+from tests.func.test_repro import TestRepro
 
 
 class TestDestroyNoConfirmation(TestRepro):
diff --git a/tests/test_diff.py b/tests/func/test_diff.py
similarity index 100%
rename from tests/test_diff.py
rename to tests/func/test_diff.py
diff --git a/tests/test_gc.py b/tests/func/test_gc.py
similarity index 100%
rename from tests/test_gc.py
rename to tests/func/test_gc.py
diff --git a/tests/test_ignore.py b/tests/func/test_ignore.py
similarity index 100%
rename from tests/test_ignore.py
rename to tests/func/test_ignore.py
diff --git a/tests/test_import.py b/tests/func/test_import.py
similarity index 100%
rename from tests/test_import.py
rename to tests/func/test_import.py
diff --git a/tests/test_init.py b/tests/func/test_init.py
similarity index 100%
rename from tests/test_init.py
rename to tests/func/test_init.py
diff --git a/tests/test_install.py b/tests/func/test_install.py
similarity index 100%
rename from tests/test_install.py
rename to tests/func/test_install.py
diff --git a/tests/test_lock.py b/tests/func/test_lock.py
similarity index 100%
rename from tests/test_lock.py
rename to tests/func/test_lock.py
diff --git a/tests/test_metrics.py b/tests/func/test_metrics.py
similarity index 100%
rename from tests/test_metrics.py
rename to tests/func/test_metrics.py
diff --git a/tests/test_move.py b/tests/func/test_move.py
similarity index 99%
rename from tests/test_move.py
rename to tests/func/test_move.py
index 7b5398a51..c05d69f15 100644
--- a/tests/test_move.py
+++ b/tests/func/test_move.py
@@ -6,7 +6,7 @@ from dvc.stage import Stage
 from dvc.utils import load_stage_file
 
 from tests.basic_env import TestDvc
-from tests.test_repro import TestRepro
+from tests.func.test_repro import TestRepro
 from tests.utils import cd
 
 
diff --git a/tests/test_output.py b/tests/func/test_output.py
similarity index 100%
rename from tests/test_output.py
rename to tests/func/test_output.py
diff --git a/tests/test_pipeline.py b/tests/func/test_pipeline.py
similarity index 99%
rename from tests/test_pipeline.py
rename to tests/func/test_pipeline.py
index 2e24bb85f..34cc63933 100644
--- a/tests/test_pipeline.py
+++ b/tests/func/test_pipeline.py
@@ -3,7 +3,7 @@ import logging
 from dvc.main import main
 
 from tests.basic_env import TestDvc
-from tests.test_repro import TestRepro, TestReproChangedDeepData
+from tests.func.test_repro import TestRepro, TestReproChangedDeepData
 import os
 
 
diff --git a/tests/test_pkg.py b/tests/func/test_pkg.py
similarity index 100%
rename from tests/test_pkg.py
rename to tests/func/test_pkg.py
diff --git a/tests/test_remote.py b/tests/func/test_remote.py
similarity index 98%
rename from tests/test_remote.py
rename to tests/func/test_remote.py
index 61f5ace7a..528a8ff06 100644
--- a/tests/test_remote.py
+++ b/tests/func/test_remote.py
@@ -6,7 +6,7 @@ from dvc.command.remote import CmdRemoteAdd
 from dvc.config import Config
 
 from tests.basic_env import TestDvc
-from tests.test_data_cloud import get_local_storagepath
+from tests.func.test_data_cloud import get_local_storagepath
 
 
 class TestRemote(TestDvc):
diff --git a/tests/test_remove.py b/tests/func/test_remove.py
similarity index 100%
rename from tests/test_remove.py
rename to tests/func/test_remove.py
diff --git a/tests/test_repo.py b/tests/func/test_repo.py
similarity index 100%
rename from tests/test_repo.py
rename to tests/func/test_repo.py
diff --git a/tests/test_repro.py b/tests/func/test_repro.py
similarity index 99%
rename from tests/test_repro.py
rename to tests/func/test_repro.py
index ed2e79648..b86889b42 100644
--- a/tests/test_repro.py
+++ b/tests/func/test_repro.py
@@ -29,9 +29,9 @@ from dvc.exceptions import (
 )
 
 from tests.basic_env import TestDvc
-from tests.test_data_cloud import _should_test_aws, TEST_AWS_REPO_BUCKET
-from tests.test_data_cloud import _should_test_gcp, TEST_GCP_REPO_BUCKET
-from tests.test_data_cloud import _should_test_ssh, _should_test_hdfs
+from tests.func.test_data_cloud import _should_test_aws, TEST_AWS_REPO_BUCKET
+from tests.func.test_data_cloud import _should_test_gcp, TEST_GCP_REPO_BUCKET
+from tests.func.test_data_cloud import _should_test_ssh, _should_test_hdfs
 from tests.utils.httpd import StaticFileServer
 from mock import patch
 
diff --git a/tests/test_run.py b/tests/func/test_run.py
similarity index 100%
rename from tests/test_run.py
rename to tests/func/test_run.py
diff --git a/tests/test_s3.py b/tests/func/test_s3.py
similarity index 95%
rename from tests/test_s3.py
rename to tests/func/test_s3.py
index eb83b1999..fae7b692b 100644
--- a/tests/test_s3.py
+++ b/tests/func/test_s3.py
@@ -5,7 +5,7 @@ import boto3
 import pytest
 
 from dvc.remote.s3 import RemoteS3
-from tests.test_data_cloud import TEST_AWS_REPO_BUCKET, _should_test_aws
+from tests.func.test_data_cloud import TEST_AWS_REPO_BUCKET, _should_test_aws
 
 
 def _get_src_dst():
diff --git a/tests/test_scm.py b/tests/func/test_scm.py
similarity index 100%
rename from tests/test_scm.py
rename to tests/func/test_scm.py
diff --git a/tests/test_stage.py b/tests/func/test_stage.py
similarity index 100%
rename from tests/test_stage.py
rename to tests/func/test_stage.py
diff --git a/tests/test_state.py b/tests/func/test_state.py
similarity index 100%
rename from tests/test_state.py
rename to tests/func/test_state.py
diff --git a/tests/test_status.py b/tests/func/test_status.py
similarity index 100%
rename from tests/test_status.py
rename to tests/func/test_status.py
diff --git a/tests/test_system.py b/tests/func/test_system.py
similarity index 100%
rename from tests/test_system.py
rename to tests/func/test_system.py
diff --git a/tests/test_tag.py b/tests/func/test_tag.py
similarity index 100%
rename from tests/test_tag.py
rename to tests/func/test_tag.py
diff --git a/tests/test_tree.py b/tests/func/test_tree.py
similarity index 100%
rename from tests/test_tree.py
rename to tests/func/test_tree.py
diff --git a/tests/test_unprotect.py b/tests/func/test_unprotect.py
similarity index 100%
rename from tests/test_unprotect.py
rename to tests/func/test_unprotect.py
diff --git a/tests/test_updater.py b/tests/func/test_updater.py
similarity index 100%
rename from tests/test_updater.py
rename to tests/func/test_updater.py
diff --git a/tests/test_utils.py b/tests/func/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to tests/func/test_utils.py