diff --git a/tcp_tests/templates/shared-sl-tests.yaml b/tcp_tests/templates/shared-sl-tests.yaml
index a2103a4..0cd49b3 100644
--- a/tcp_tests/templates/shared-sl-tests.yaml
+++ b/tcp_tests/templates/shared-sl-tests.yaml
@@ -2,7 +2,7 @@
 
 {% set SL_TEST_BRANCH = os_env('SL_TEST_BRANCH','master') %}
 {% set SL_TEST_REPO = os_env('SL_TEST_REPO','https://github.com/Mirantis/stacklight-pytest') %}
-{% set SL_TEST_TO_RUN = os_env('set SL_TEST_TO_RUN','stacklight_tests/tests/prometheus/test_smoke.py') %}
+{% set SL_TEST_TO_RUN = os_env('set SL_TEST_TO_RUN','stacklight_tests/tests/test_smoke.py') %}
 
 {%- macro MACRO_CLONE_SL_TESTS() %}
 {############################################################}
diff --git a/tcp_tests/tests/system/test_failover_nodes.py b/tcp_tests/tests/system/test_failover_nodes.py
index 1f628c4..8d1f46a 100644
--- a/tcp_tests/tests/system/test_failover_nodes.py
+++ b/tcp_tests/tests/system/test_failover_nodes.py
@@ -167,7 +167,7 @@
         sl_os_deployed.check_prometheus_targets(mon_nodes)
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
         # STEP #5
@@ -181,7 +181,7 @@
         # Run SL component tetsts
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
@@ -217,7 +217,7 @@
         sl_os_deployed.check_prometheus_targets(mon_nodes)
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
         # STEP #5
@@ -228,7 +228,7 @@
         # Run SL component tetsts
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
@@ -270,7 +270,7 @@
         LOG.debug('Mon nodes list {0}'.format(mon_nodes))
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
 
@@ -303,7 +303,7 @@
         # Run SL component tetsts
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
diff --git a/tcp_tests/tests/system/test_failover_stacklight_services.py b/tcp_tests/tests/system/test_failover_stacklight_services.py
index 4f4381f..997b4f7 100644
--- a/tcp_tests/tests/system/test_failover_stacklight_services.py
+++ b/tcp_tests/tests/system/test_failover_stacklight_services.py
@@ -74,7 +74,7 @@
         LOG.debug('Mon nodes list {0}'.format(mon_nodes))
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
 
@@ -103,7 +103,7 @@
         show_step(10)
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
@@ -141,7 +141,7 @@
         LOG.debug('Mon nodes list {0}'.format(mon_nodes))
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
         # STEP #5
@@ -169,7 +169,7 @@
         show_step(10)
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
@@ -208,7 +208,7 @@
         LOG.debug('Mon nodes list {0}'.format(mon_nodes))
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
         # STEP #5
@@ -238,7 +238,7 @@
         show_step(10)
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
@@ -276,7 +276,7 @@
         LOG.debug('Mon nodes list {0}'.format(mon_nodes))
         before_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         failed_tests = [test['name'] for test in
                         before_result if 'passed' not in test['outcome']]
 
@@ -307,7 +307,7 @@
         show_step(10)
         after_result = sl_os_deployed.run_sl_tests_json(
             'cfg01', '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus/', 'test_alerts.py')
+            'tests/', 'test_alerts.py')
         for test in after_result:
             if test['name'] not in failed_tests:
                 assert 'passed' in test['outcome'], \
diff --git a/tcp_tests/tests/system/test_install_cookied_ocata.py b/tcp_tests/tests/system/test_install_cookied_ocata.py
index 7aa41b2..bee6f87 100644
--- a/tcp_tests/tests/system/test_install_cookied_ocata.py
+++ b/tcp_tests/tests/system/test_install_cookied_ocata.py
@@ -109,7 +109,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         show_step(10)
diff --git a/tcp_tests/tests/system/test_install_k8s.py b/tcp_tests/tests/system/test_install_k8s.py
index ba5a81d..67d3635 100644
--- a/tcp_tests/tests/system/test_install_k8s.py
+++ b/tcp_tests/tests/system/test_install_k8s.py
@@ -114,7 +114,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
@@ -173,7 +173,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
diff --git a/tcp_tests/tests/system/test_install_mcp11_ovs_ocata.py b/tcp_tests/tests/system/test_install_mcp11_ovs_ocata.py
index 4f78c0d..8c9e89c 100644
--- a/tcp_tests/tests/system/test_install_mcp11_ovs_ocata.py
+++ b/tcp_tests/tests/system/test_install_mcp11_ovs_ocata.py
@@ -73,7 +73,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
@@ -132,7 +132,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
diff --git a/tcp_tests/tests/system/test_install_mcp_ovs_pike.py b/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
index f7c49a6..1077c2f 100644
--- a/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
+++ b/tcp_tests/tests/system/test_install_mcp_ovs_pike.py
@@ -74,7 +74,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
@@ -133,7 +133,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
diff --git a/tcp_tests/tests/system/test_install_mcp_queens.py b/tcp_tests/tests/system/test_install_mcp_queens.py
index b644d26..315053e 100644
--- a/tcp_tests/tests/system/test_install_mcp_queens.py
+++ b/tcp_tests/tests/system/test_install_mcp_queens.py
@@ -94,7 +94,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
@@ -152,7 +152,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
@@ -210,7 +210,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
diff --git a/tcp_tests/tests/system/test_install_mcp_sl_os.py b/tcp_tests/tests/system/test_install_mcp_sl_os.py
index 58ad9c7..93358cb 100644
--- a/tcp_tests/tests/system/test_install_mcp_sl_os.py
+++ b/tcp_tests/tests/system/test_install_mcp_sl_os.py
@@ -91,7 +91,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
diff --git a/tcp_tests/tests/system/test_install_mcp_trusty.py b/tcp_tests/tests/system/test_install_mcp_trusty.py
index c91d3a4..9279bed 100644
--- a/tcp_tests/tests/system/test_install_mcp_trusty.py
+++ b/tcp_tests/tests/system/test_install_mcp_trusty.py
@@ -72,7 +72,7 @@
         stacklight_deployed.run_sl_functional_tests(
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
-            'tests/prometheus',
+            'tests',
             'test_alerts.py')
 
         # Download report
diff --git a/tcp_tests/tests/system/test_install_opencontrail.py b/tcp_tests/tests/system/test_install_opencontrail.py
index 63a60f2..0e12205 100644
--- a/tcp_tests/tests/system/test_install_opencontrail.py
+++ b/tcp_tests/tests/system/test_install_opencontrail.py
@@ -54,7 +54,7 @@
             stacklight_deployed.run_sl_functional_tests(
                 'cfg01',
                 '/root/stacklight-pytest/stacklight_tests/',
-                'tests/prometheus',
+                'tests',
                 'test_alerts.py')
             show_step(8)
             # Download report
@@ -114,7 +114,7 @@
             stacklight_deployed.run_sl_functional_tests(
                 'ctl01',
                 '/root/stacklight-pytest/stacklight_tests/',
-                'tests/prometheus',
+                'tests',
                 'test_alerts.py')
             show_step(8)
             # Download report
@@ -180,7 +180,7 @@
             stacklight_deployed.run_sl_functional_tests(
                 'cfg01',
                 '/root/stacklight-pytest/stacklight_tests/',
-                'tests/prometheus',
+                'tests',
                 'test_alerts.py')
             show_step(8)
             # Download report
diff --git a/tcp_tests/tests/system/test_upgrade_stacklight.py b/tcp_tests/tests/system/test_upgrade_stacklight.py
index afad0c8..56f6a79 100644
--- a/tcp_tests/tests/system/test_upgrade_stacklight.py
+++ b/tcp_tests/tests/system/test_upgrade_stacklight.py
@@ -51,7 +51,7 @@
             'cfg01',
             '/root/stacklight-pytest/stacklight_tests/',
             'tests',
-            'tests/prometheus')
+            'tests_alerts.py')
 
 # Download report
         stacklight_deployed.download_sl_test_report(