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 7d67dbc..4346b92 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
@@ -44,7 +44,7 @@ def admin_node(config, underlay, ccpcluster):
 
 
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
-@pytest.mark.component
+@pytest.mark.component_ccp
 class TestCppCliNormalMessageInShowDep(object):
     """Check info messages when show-dep is success"""
 
@@ -179,7 +179,7 @@ class TestCppCliNormalMessageInShowDep(object):
 
 
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
-@pytest.mark.component
+@pytest.mark.component_ccp
 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 34c9632..454442b 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
@@ -35,7 +35,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
+@pytest.mark.component_ccp
 class TestCppCliErrorInFetch(object):
     """Check exit codes when fetch is failing
 
@@ -78,7 +78,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
+@pytest.mark.component_ccp
 class TestCppCliBuildExitCode(object):
     """Check exit codes when build is failing
 
@@ -112,7 +112,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
+@pytest.mark.component_ccp
 class TestCppCliDeploy(object):
     """Check exit codes when deploy is failing
 
@@ -130,7 +130,7 @@ class TestCppCliDeploy(object):
         clean_repos(admin_node)
 
 
-@pytest.mark.component
+@pytest.mark.component_ccp
 class TestCppCliErrorInShowDep(object):
     """Check exit codes when show-dep is failing"""
 
diff --git a/fuel_ccp_tests/tests/component/ccp/test_dry_run.py b/fuel_ccp_tests/tests/component/ccp/test_dry_run.py
index 486a216..b09be91 100644
--- a/fuel_ccp_tests/tests/component/ccp/test_dry_run.py
+++ b/fuel_ccp_tests/tests/component/ccp/test_dry_run.py
@@ -20,7 +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
+@pytest.mark.component_ccp_heavy
 class TestDryRun(object):
     """Deploy OpenStack from prebuilt yaml templates
 
diff --git a/fuel_ccp_tests/tests/component/ccp/test_reconfig.py b/fuel_ccp_tests/tests/component/ccp/test_reconfig.py
index f387104..a0e69bf 100644
--- a/fuel_ccp_tests/tests/component/ccp/test_reconfig.py
+++ b/fuel_ccp_tests/tests/component/ccp/test_reconfig.py
@@ -28,7 +28,7 @@ LOG = logger.logger
 @pytest.mark.ccp_cli_reconfig
 @pytest.mark.ccp_cli_redeploy
 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
-@pytest.mark.component
+@pytest.mark.component_ccp_heavy
 def test_deploy_and_reconfig_keystone(config, ccpcluster,
                                       k8s_actions, underlay):
 
diff --git a/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py b/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
index b685b5a..35ac339 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
@@ -131,7 +131,7 @@ class AppControllerResoucesStatus(object):
 
 
 @pytest.mark.AppController
-@pytest.mark.component
+@pytest.mark.component_k8s
 class TestAppController(object):
 
     kube_settings = {
diff --git a/fuel_ccp_tests/tests/component/k8s/test_dashboard.py b/fuel_ccp_tests/tests/component/k8s/test_dashboard.py
index cd28bb0..40b3ec3 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_dashboard.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_dashboard.py
@@ -21,7 +21,7 @@ LOG = logger.logger
 
 
 @pytest.mark.k8s_dashboard
-@pytest.mark.component
+@pytest.mark.component_k8s
 class TestK8sDashboard(object):
 
     kube_settings = {
diff --git a/fuel_ccp_tests/tests/component/k8s/test_k8s_lvm_plugin_usage.py b/fuel_ccp_tests/tests/component/k8s/test_k8s_lvm_plugin_usage.py
index 07f4342..ee9718c 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_k8s_lvm_plugin_usage.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_k8s_lvm_plugin_usage.py
@@ -19,7 +19,7 @@ from fuel_ccp_tests.helpers import ext
 LOG = logger.logger
 
 
-@pytest.mark.component
+@pytest.mark.component_k8s
 class TestLVMPluginUsage(object):
     """Tests using k8s' LVM plugin.
 
diff --git a/fuel_ccp_tests/tests/component/k8s/test_namespaces.py b/fuel_ccp_tests/tests/component/k8s/test_namespaces.py
index ad99031..a06c82f 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_namespaces.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_namespaces.py
@@ -18,6 +18,6 @@ expected_namespaces = ('default', 'kube-system')
 
 
 @pytest.mark.parametrize('ns', expected_namespaces)
-@pytest.mark.component
+@pytest.mark.component_k8s
 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 fd98a03..7a776c8 100644
--- a/fuel_ccp_tests/tests/component/k8s/test_services.py
+++ b/fuel_ccp_tests/tests/component/k8s/test_services.py
@@ -18,6 +18,6 @@ expected_services = ('kubernetes',)
 
 
 @pytest.mark.parametrize('service', expected_services)
-@pytest.mark.component
+@pytest.mark.component_k8s
 def test_exist_service(k8scluster, service):
     k8scluster.api.services.get(name=service)