diff --git a/fuelweb_test/tests/base_test_case.py b/fuelweb_test/tests/base_test_case.py
index 970845729..f1a3d2ba5 100644
--- a/fuelweb_test/tests/base_test_case.py
+++ b/fuelweb_test/tests/base_test_case.py
@@ -360,9 +360,7 @@ class TestBasic(object):
         self.fuel_post_install_actions()
 
     def check_fuel_version(self):
-        admin_ip = self.env.get_admin_node_ip()
-        cmd = "fuel fuel-version --json"
-        output = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
+        output = self.fuel_web.client.get_api_version()
         fuel_release = output['release']
         err_msg = "Fuel version should be `{}` but it is `{}`".format(
             settings.FUEL_RELEASE_VERSION, fuel_release)
diff --git a/fuelweb_test/tests/test_ssl.py b/fuelweb_test/tests/test_ssl.py
index aafa19967..8b1f5e0f5 100644
--- a/fuelweb_test/tests/test_ssl.py
+++ b/fuelweb_test/tests/test_ssl.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from proboscis import SkipTest
 from proboscis import test
 from proboscis.asserts import assert_equal
 # pylint: disable=import-error
@@ -83,7 +84,10 @@ class SSL_Tests(TestBasic):
         self.show_step(2)
         self.show_step(3)
         self.show_step(4)
-        self.env.revert_snapshot("master_node_with_https_only")
+        snapshot_name = 'master_node_with_https_only'
+        if not self.env.d_env.has_snapshot(snapshot_name):
+            raise SkipTest('Snapshot {} not found'.format(snapshot_name))
+        self.env.revert_snapshot(snapshot_name)
         self.show_step(5)
         cluster_id = self.fuel_web.create_cluster(
             name=self.__class__.__name__,