diff --git a/fuel_ccp_tests/tests/component/ccp/dry_run.py b/fuel_ccp_tests/tests/component/ccp/dry_run.py
index 5939faf..486a216 100644
--- a/fuel_ccp_tests/tests/component/ccp/dry_run.py
+++ b/fuel_ccp_tests/tests/component/ccp/dry_run.py
@@ -20,6 +20,7 @@ from fuel_ccp_tests.helpers import ext
 
 @pytest.mark.do_dry_run
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
+@pytest.mark.component
 class TestDryRun(object):
     """Deploy OpenStack from prebuilt yaml templates
 
diff --git a/fuel_ccp_tests/tests/component/ccp/test_ccp_cli_messages.py b/fuel_ccp_tests/tests/component/ccp/test_ccp_cli_messages.py
index 13e9bc1..1822f72 100644
--- a/fuel_ccp_tests/tests/component/ccp/test_ccp_cli_messages.py
+++ b/fuel_ccp_tests/tests/component/ccp/test_ccp_cli_messages.py
@@ -42,6 +42,7 @@ def admin_node(config, underlay, ccpcluster):
 
 
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
+@pytest.mark.component
 class TestCppCliNormalMessageInShowDep(object):
     """Check info messages when show-dep is success"""
 
@@ -176,6 +177,7 @@ class TestCppCliNormalMessageInShowDep(object):
 
 
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
+@pytest.mark.component
 class TestCppCliErrorMessageInShowDep(object):
     """Check error messages when show-dep is failing"""
 
diff --git a/fuel_ccp_tests/tests/component/ccp/test_ccp_errexit_codes.py b/fuel_ccp_tests/tests/component/ccp/test_ccp_errexit_codes.py
index 0457c2c..0fc4da9 100644
--- a/fuel_ccp_tests/tests/component/ccp/test_ccp_errexit_codes.py
+++ b/fuel_ccp_tests/tests/component/ccp/test_ccp_errexit_codes.py
@@ -34,6 +34,7 @@ def clean_repos(node):
 @pytest.mark.ccp_cli_errexit_codes
 @pytest.mark.ccp_cli_error_in_fetch
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
+@pytest.mark.component
 class TestCppCliErrorInFetch(object):
     """Check exit codes when fetch is failing
 
@@ -64,6 +65,7 @@ class TestCppCliErrorInFetch(object):
 @pytest.mark.ccp_cli_errexit_codes
 @pytest.mark.ccp_cli_build_exit_code
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
+@pytest.mark.component
 class TestCppCliBuildExitCode(object):
     """Check exit codes when build is failing
 
@@ -91,6 +93,7 @@ class TestCppCliBuildExitCode(object):
 @pytest.mark.ccp_cli_errexit_codes
 @pytest.mark.ccp_cli_deploy_exit_code
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
+@pytest.mark.component
 class TestCppCliDeploy(object):
     """Check exit codes when deploy is failing
 
@@ -105,6 +108,7 @@ class TestCppCliDeploy(object):
         clean_repos(admin_node)
 
 
+@pytest.mark.component
 class TestCppCliErrorInShowDep(object):
     """Check exit codes when show-dep is failing"""
 
diff --git a/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py b/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
index b618c87..28d9b56 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
@@ -122,6 +122,7 @@ class AppControllerResoucesStatus(object):
 
 
 @pytest.mark.AppController
+@pytest.mark.component
 class TestAppController(object):
 
     kube_settings = {
diff --git a/fuel_ccp_tests/tests/component/k8s/test_namespaces.py b/fuel_ccp_tests/tests/component/k8s/test_namespaces.py
index 5020479..ad99031 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_namespaces.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_namespaces.py
@@ -18,5 +18,6 @@ expected_namespaces = ('default', 'kube-system')
 
 
 @pytest.mark.parametrize('ns', expected_namespaces)
+@pytest.mark.component
 def test_exist_namespace(k8scluster, ns):
     k8scluster.api.namespaces.get(name=ns)
diff --git a/fuel_ccp_tests/tests/component/k8s/test_services.py b/fuel_ccp_tests/tests/component/k8s/test_services.py
index 7abc3fe..fd98a03 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_services.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_services.py
@@ -18,5 +18,6 @@ expected_services = ('kubernetes',)
 
 
 @pytest.mark.parametrize('service', expected_services)
+@pytest.mark.component
 def test_exist_service(k8scluster, service):
     k8scluster.api.services.get(name=service)
diff --git a/fuel_ccp_tests/tests/system/test_ccp_install_k8s.py b/fuel_ccp_tests/tests/system/test_ccp_install_k8s.py
index 737873a..4806be4 100644
--- a/fuel_ccp_tests/tests/system/test_ccp_install_k8s.py
+++ b/fuel_ccp_tests/tests/system/test_ccp_install_k8s.py
@@ -31,6 +31,7 @@ class FuelCCPInstallerConfigMixin:
 
 
 @pytest.mark.fuel_ccp_installer
+@pytest.mark.system
 class TestFuelCCPInstaller(base_test.SystemBaseTest,
                            FuelCCPInstallerConfigMixin):
     """Test class for testing k8s deployed by fuel-ccp-installer
@@ -226,6 +227,7 @@ class TestFuelCCPInstaller(base_test.SystemBaseTest,
 
 
 @pytest.mark.fuel_ccp_installer_idempotency
+@pytest.mark.system
 class TestFuelCCPInstallerIdempotency(base_test.SystemBaseTest,
                                       FuelCCPInstallerConfigMixin):
 
diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py
index b041202..6c8acee 100644
--- a/fuel_ccp_tests/tests/system/test_deploy.py
+++ b/fuel_ccp_tests/tests/system/test_deploy.py
@@ -31,6 +31,7 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
     @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
     @pytest.mark.deploy_openstack
     @pytest.mark.fail_snapshot
+    @pytest.mark.smoke
     def test_fuel_ccp_deploy_microservices(self, ccpcluster, k8s_actions):
         """Deploy base environment
 
diff --git a/fuel_ccp_tests/tests/system/test_lcm_scale_k8s.py b/fuel_ccp_tests/tests/system/test_lcm_scale_k8s.py
index 55dd498..5ab1dc3 100644
--- a/fuel_ccp_tests/tests/system/test_lcm_scale_k8s.py
+++ b/fuel_ccp_tests/tests/system/test_lcm_scale_k8s.py
@@ -18,6 +18,7 @@ from fuel_ccp_tests.helpers import ext
 
 
 @pytest.mark.fuel_ccp_scale_k8s
+@pytest.mark.system
 class TestLCMScaleK8s(base_test.SystemBaseTest):
     """Test class for testing k8s scale by fuel-ccp-installer
 
diff --git a/fuel_ccp_tests/tests/system/test_netchecker.py b/fuel_ccp_tests/tests/system/test_netchecker.py
index 1198f24..19aa41d 100644
--- a/fuel_ccp_tests/tests/system/test_netchecker.py
+++ b/fuel_ccp_tests/tests/system/test_netchecker.py
@@ -54,6 +54,7 @@ class TestFuelCCPNetCheckerMixin:
 
 
 @pytest.mark.usefixtures("check_netchecker_files")
+@pytest.mark.system
 class TestFuelCCPNetChecker(SystemBaseTest, TestFuelCCPNetCheckerMixin):
     """Test class for network connectivity verification in k8s"""