diff --git a/doc/test/source/test_suite_smoke.rst b/doc/test/source/test_suite_smoke.rst
index 40233d8..79bf412 100644
--- a/doc/test/source/test_suite_smoke.rst
+++ b/doc/test/source/test_suite_smoke.rst
@@ -311,7 +311,7 @@ Steps
 #####
 
     1. Install NSXv plugin.
-    2. Enable plugin on tab Settings -> NSXv plugin.
+    2. Enable plugin on tab Networks -> NSXv plugin.
     3. Fill the form with corresponding values.
     4. Set checkbox 'Enable HA for NSX Edges'.
     5. Deploy cluster with one controller.
@@ -324,6 +324,45 @@ Expected result
 Cluster should be deployed and all OSTF test cases should be passed.
 
 
+Check option 'Bypass NSX Manager certificate verification' works correct
+------------------------------------------------------------------------
+
+
+ID
+##
+
+nsxv_insecure_false
+
+
+Description
+###########
+
+Check that insecure checkbox functions properly.
+
+
+Complexity
+##########
+
+core
+
+
+Steps
+#####
+
+    1. Install NSXv plugin.
+    2. Enable plugin on tab Networks -> NSXv plugin.
+    3. Fill the form with corresponding values.
+    4. Uncheck checkbox 'Bypass NSX Manager certificate verification'.
+    5. Deploy cluster with one controller.
+    6. Run OSTF.
+
+
+Expected result
+###############
+
+Cluster should be deployed and all OSTF test cases should be passed.
+
+
 Verify that nsxv driver configured properly after enabling NSXv plugin
 ----------------------------------------------------------------------
 
@@ -350,7 +389,7 @@ Steps
 #####
 
     1. Install NSXv plugin.
-    2. Enable plugin on tab Settings -> NSXv plugin.
+    2. Enable plugin on tab Networks -> NSXv plugin.
     3. Fill the form with corresponding values.
     4. Do all things that are necessary to provide interoperability of NSXv plugin and NSX Manager with certificate.
     5. Check Additional settings. Fill the form with corresponding values. Save settings by pressing the button.
@@ -443,3 +482,43 @@ Steps
 Expected result
 ###############
 All OSTF are passed.
+
+
+Deploy HOT
+----------
+
+
+ID
+##
+
+nsxv_hot
+
+
+Description
+###########
+
+Template creates flavor, net, security group, instance.
+
+
+Complexity
+##########
+
+smoke
+
+
+Steps
+#####
+
+    1. Deploy cluster with NSXv.
+    2. Copy nsxv_stack.yaml to controller on which heat will be run.
+    3. On controller node run command::
+
+         . ./openrc
+         heat stack-create -f nsxv_stack.yaml teststack
+       Wait for status COMPLETE.
+    4. Run OSTF.
+
+
+Expected result
+###############
+All OSTF are passed.
diff --git a/doc/test/source/test_suite_system.rst b/doc/test/source/test_suite_system.rst
index f900a90..ac4244f 100644
--- a/doc/test/source/test_suite_system.rst
+++ b/doc/test/source/test_suite_system.rst
@@ -10,7 +10,7 @@ Setup for system tests
 ID
 ##
 
-nsxv_setup_system
+nsxv_ha_mode
 
 
 Description
@@ -1087,7 +1087,7 @@ Steps
 #####
 
     1. Install NSXv plugin.
-    2. Enable plugin on tab Settings -> NSXv plugin.
+    2. Enable plugin on tab Networks -> NSXv plugin.
     3. Fill the form with corresponding values.
     4. Generate certificate and upload it into field 'Certificate for metadata proxy'.
     5. Upload key into field 'Private key'('Private key for metadata certificate').
diff --git a/doc/user/source/known-issues.rst b/doc/user/source/known-issues.rst
index 85e76df..30fba5b 100644
--- a/doc/user/source/known-issues.rst
+++ b/doc/user/source/known-issues.rst
@@ -17,3 +17,11 @@ Change of ``admin_state_up`` does not affect actual port state
 NSX plugin does not change *admin_state_up* of a port. Even if operator
 executes ``neutron port-update`` command, port will remain in active state, but
 will be reported as ``admin_state_up: False`` by ``neutron port-show`` command.
+
+3 OSTF fails in configuration with ceilometer
+---------------------------------------------
+
+Test nsxv_ceilometer marked as Passed.
+We don't have TestVM image due to disabled 'nova' AZ. So we wish to see these
+tests with TestVM-VMDK image only.
+See `LP1592357 <https://bugs.launchpad.net/fuel-plugin-nsxv/+bug/1592357>`_.
diff --git a/plugin_test/tests/test_plugin_nsxv.py b/plugin_test/tests/test_plugin_nsxv.py
index 0dbc744..1e48add 100644
--- a/plugin_test/tests/test_plugin_nsxv.py
+++ b/plugin_test/tests/test_plugin_nsxv.py
@@ -607,6 +607,52 @@ class TestNSXvPlugin(TestBasic):
             cluster_id=cluster_id,
             test_sets=['smoke'])
 
+    @test(depends_on=[SetupEnvironment.prepare_slaves_1],
+          groups=["nsxv_insecure_false"])
+    @log_snapshot_after_test
+    def nsxv_insecure_false(self):
+        """Check that NSXv can configure SSL connection.
+
+        Scenario:
+            1. Upload the plugin to master node.
+            2. Create cluster and provision one controller node.
+            3. Configure NSXv for that cluster.
+            4. Uncheck checkbox 'Bypass NSX Manager certificate verification'.
+            5. Deploy cluster.
+            6. Run OSTF.
+
+        Duration 90 min
+
+        """
+        self.env.revert_snapshot('ready_with_1_slaves')
+
+        self.install_nsxv_plugin()
+
+        # Configure cluster
+        settings = self.get_settings()
+        # Configure cluster
+        cluster_id = self.fuel_web.create_cluster(
+            name=self.__class__.__name__,
+            mode=DEPLOYMENT_MODE,
+            settings=settings,
+            configure_ssl=False)
+
+        # Assign roles to nodes
+        self.fuel_web.update_nodes(
+            cluster_id,
+            {'slave-01': ['controller'], })
+
+        # Configure VMWare vCenter settings
+        self.fuel_web.vcenter_configure(cluster_id)
+
+        self.enable_plugin(cluster_id, {'nsxv_insecure/value': False})
+
+        self.fuel_web.deploy_cluster_wait(cluster_id)
+
+        self.fuel_web.run_ostf(
+            cluster_id=cluster_id,
+            test_sets=['smoke'])
+
     @test(depends_on=[SetupEnvironment.prepare_slaves_9],
           groups=["nsxv_bvt"])
     @log_snapshot_after_test