diff --git a/cvp_checks/tests/ceph/test_ceph.py b/cvp_checks/tests/ceph/test_ceph.py
index c14778d..6969d8a 100644
--- a/cvp_checks/tests/ceph/test_ceph.py
+++ b/cvp_checks/tests/ceph/test_ceph.py
@@ -5,7 +5,7 @@
     osd_fail = local_salt_client.cmd(
         'ceph:osd',
         'cmd.run',
-        ['ceph osd tree | grep up'],
+        ['ceph osd tree | grep down'],
         expr_form='pillar')
     if not osd_fail:
         pytest.skip("Ceph is not found on this environment")
diff --git a/cvp_checks/tests/test_galera_cluster.py b/cvp_checks/tests/test_galera_cluster.py
index 83e3444..003b0d6 100644
--- a/cvp_checks/tests/test_galera_cluster.py
+++ b/cvp_checks/tests/test_galera_cluster.py
@@ -5,6 +5,9 @@
         ['salt-call mysql.status | grep -A1 wsrep_cluster_size | tail -n1'],
         expr_form='pillar')
 
+    if not gs:
+        pytest.skip("Galera is not found on this environment")
+
     size_cluster = []
     amount = len(gs)