diff --git a/tcp_tests/tests/system/test_tcp_install.py b/tcp_tests/tests/system/test_tcp_install.py
index cf40b3c..dcb31d6 100644
--- a/tcp_tests/tests/system/test_tcp_install.py
+++ b/tcp_tests/tests/system/test_tcp_install.py
@@ -58,3 +58,32 @@
 
         fail_msg = 'Tempest verification fails {}'.format(res)
         assert res['failures'] == 0, fail_msg
+
+    @pytest.mark.revert_snapshot(ext.SNAPSHOT.salt_deployed)
+    # @pytest.mark.snapshot_needed
+    # @pytest.mark.fail_snapshot
+    def test_tcp_install_with_scripts(self, config, underlay, salt_deployed,
+                                      show_step, rally):
+        """Test for deploying an tcp environment with scripts and check it
+
+        Scenario:
+            1. Prepare salt on hosts
+            2. Setup controller nodes
+            3. Setup compute nodes
+
+        """
+
+        cmd = 'cd /srv/salt/reclass/scripts/; ./bootstrap_all.sh'
+        underlay.check_call(cmd, host=config.salt.salt_master_host, verbose=True)
+
+        # prepare rally
+        rally.prepare()
+        rally.pull_image()
+        rally.run()
+        # run tempest
+        rally.run_tempest()
+
+        res = rally.get_results()
+
+        fail_msg = 'Tempest verification fails {}'.format(res)
+        assert res['failures'] == 0, fail_msg