diff --git a/test_set/cvp-sanity/tests/test_drivetrain.py b/test_set/cvp-sanity/tests/test_drivetrain.py
index 1b71ad0..63d304b 100644
--- a/test_set/cvp-sanity/tests/test_drivetrain.py
+++ b/test_set/cvp-sanity/tests/test_drivetrain.py
@@ -316,7 +316,7 @@
             continue
 
         actual_version = BranchSpec[0].getElementsByTagName('name')[0].childNodes[0].data
-        if actual_version not in expected_version and expected_version != '':
+        if expected_version and actual_version not in expected_version:
             version_mismatch.append("Job {0} has {1} branch."
                                     "Expected {2}".format(job_name,
                                                           actual_version,
@@ -440,4 +440,4 @@
             sep="\n" + "-" * 20 + "\n",
             kubectl_output=pods_statuses_output,
             report=report_with_errors
-        )
\ No newline at end of file
+        )
diff --git a/test_set/cvp-sanity/tests/test_mounts.py b/test_set/cvp-sanity/tests/test_mounts.py
index 2eca9fd..b79e6db 100644
--- a/test_set/cvp-sanity/tests/test_mounts.py
+++ b/test_set/cvp-sanity/tests/test_mounts.py
@@ -34,8 +34,12 @@
     for node in mounts_by_nodes:
         if node in exclude_nodes:
             continue
-        result[node] = "\n".join(sorted(mounts_by_nodes[node].split()))
-        pretty_result[node] = sorted(mounts_by_nodes[node].split())
+        if isinstance(mounts_by_nodes[node], bool):
+            result[node] = 'Cannot access this node'
+            pretty_result[node] = 'Cannot access this node'
+        else:
+            result[node] = "\n".join(sorted(mounts_by_nodes[node].split()))
+            pretty_result[node] = sorted(mounts_by_nodes[node].split())
 
     if not result:
         pytest.skip("These nodes are skipped")
diff --git a/test_set/cvp-sanity/tests/test_packet_checker.py b/test_set/cvp-sanity/tests/test_packet_checker.py
index 382576a..abdd04b 100644
--- a/test_set/cvp-sanity/tests/test_packet_checker.py
+++ b/test_set/cvp-sanity/tests/test_packet_checker.py
@@ -90,7 +90,7 @@
     if len(total_nodes) < 2:
         pytest.skip("Nothing to compare - only 1 node")
     list_of_pip_packages = local_salt_client.cmd(tgt="L@"+','.join(nodes_in_group),
-                                   param='pip.freeze', expr_form='compound')
+                                   fun='pip.freeze', expr_form='compound')
 
     nodes = []
 
diff --git a/test_set/cvp-sanity/tests/test_repo_list.py b/test_set/cvp-sanity/tests/test_repo_list.py
index a864b2c..8894093 100644
--- a/test_set/cvp-sanity/tests/test_repo_list.py
+++ b/test_set/cvp-sanity/tests/test_repo_list.py
@@ -1,5 +1,6 @@
 import pytest
 import logging
+import json
 
 
 @pytest.mark.full
@@ -45,7 +46,6 @@
     fail_counter = 0
     my_set.update(actual_repo_list)
     my_set.update(expected_salt_data)
-    import json
     for repo in my_set:
         rows = []
         if repo not in actual_repo_list: