diff --git a/doc/testing/test_gcs_gui.rst b/doc/testing/test_gcs_gui.rst
index 9035b83..f42a5e6 100644
--- a/doc/testing/test_gcs_gui.rst
+++ b/doc/testing/test_gcs_gui.rst
@@ -29,7 +29,8 @@ Steps
     1. Create cluster
     2. Upload plugin to the master node
     3. Install plugin
-    4. Verify default values
+    4. Create cluster
+    5. Verify default values
 
 Expected results
 ################
diff --git a/plugin_test/tests/test_gcs_gui.py b/plugin_test/tests/test_gcs_gui.py
index 159cf52..6e03f91 100644
--- a/plugin_test/tests/test_gcs_gui.py
+++ b/plugin_test/tests/test_gcs_gui.py
@@ -19,6 +19,9 @@ from proboscis import test
 from fuelweb_test.helpers.decorators import log_snapshot_after_test
 from fuelweb_test.tests.base_test_case import SetupEnvironment
 from helpers.gcs_base import GcsTestBase
+from helpers import gcs_settings
+from fuelweb_test.settings import DEPLOYMENT_MODE
+from fuelweb_test import logger
 
 
 @test(groups=["test_gcs_all"])
@@ -34,10 +37,34 @@ class TestGCSPlugin(GcsTestBase):
         Scenario:
             1. Create cluster
             2. Install GCS plugin
-            3. Verify default values
+            3. Create cluster
+            4. Verify default values
         """
         self.env.revert_snapshot("ready_with_3_slaves")
-        cluster_id = self.fuel_web.get_last_created_cluster()
+
+        logger.info('Creating GCS non HA cluster...')
+        segment_type = 'vlan'
+        cluster_id = self.fuel_web.create_cluster(
+            name=self.__class__.__name__,
+            mode=DEPLOYMENT_MODE,
+            settings={
+                "net_provider": 'neutron',
+                "net_segment_type": segment_type,
+                'tenant': gcs_settings.default_tenant,
+                'user': gcs_settings.default_user,
+                'password': gcs_settings.default_user_pass,
+                'assign_to_all_nodes': True
+            }
+        )
+
+        self.fuel_web.update_nodes(
+            cluster_id,
+            {
+                'slave-01': ['controller'],
+                'slave-02': ['compute'],
+                'slave-03': ['cinder']
+            }
+        )
 
         self.install_plugin()
         self.verify_defaults(cluster_id)
diff --git a/plugin_test/tests/test_smoke_bvt.py b/plugin_test/tests/test_smoke_bvt.py
index 58c77fc..6bbb420 100644
--- a/plugin_test/tests/test_smoke_bvt.py
+++ b/plugin_test/tests/test_smoke_bvt.py
@@ -45,7 +45,7 @@ class GcsTestClass(GcsTestBase):
         """
         self.env.revert_snapshot("ready_with_3_slaves")
 
-        logger.info('Creating GCS HA cluster...')
+        logger.info('Creating GCS non HA cluster...')
         segment_type = 'vlan'
         cluster_id = self.fuel_web.create_cluster(
             name=self.__class__.__name__,