diff --git a/sahara/tests/unit/plugins/vanilla/v2_7_1/test_versionhandler.py b/sahara/tests/unit/plugins/vanilla/v2_7_1/test_versionhandler.py
index 994eab6e..7e3c1163 100644
--- a/sahara/tests/unit/plugins/vanilla/v2_7_1/test_versionhandler.py
+++ b/sahara/tests/unit/plugins/vanilla/v2_7_1/test_versionhandler.py
@@ -16,8 +16,6 @@
 import mock
 import six
 
-from sahara.plugins.vanilla.hadoop2 import run_scripts as run
-from sahara.plugins.vanilla.hadoop2 import starting_scripts as s_scripts
 from sahara.plugins.vanilla.v2_7_1.edp_engine import EdpOozieEngine
 from sahara.plugins.vanilla.v2_7_1.edp_engine import EdpSparkEngine
 from sahara.plugins.vanilla.v2_7_1 import versionhandler as v_h
@@ -72,25 +70,19 @@ class VersionHandlerTest(base.SaharaTestCase):
         self.vh.configure_cluster(self.cluster)
         configure_cluster.assert_called_once_with(self.vh.pctx, self.cluster)
 
+    @mock.patch(plugin_path + 'v2_7_1.versionhandler.run')
+    @mock.patch(plugin_path + 'v2_7_1.versionhandler.s_scripts')
     @mock.patch('sahara.swift.swift_helper.install_ssl_certs')
     @mock.patch(plugin_hadoop2_path + 'keypairs.provision_keypairs')
     @mock.patch('sahara.plugins.utils.get_instances')
     @mock.patch('sahara.utils.cluster.get_instances')
     def test_start_cluster(self, c_get_instances, u_get_instances,
-                           provision_keypairs, install_ssl_certs):
+                           provision_keypairs, install_ssl_certs,
+                           s_scripts, run):
         self.vh.pctx = mock.Mock()
         instances = mock.Mock()
-        s_scripts.start_namenode = mock.Mock()
-        s_scripts.start_secondarynamenode = mock.Mock()
-        s_scripts.start_resourcemanager = mock.Mock()
-        s_scripts.start_historyserver = mock.Mock()
-        s_scripts.start_oozie = mock.Mock()
-        s_scripts.start_hiveserver = mock.Mock()
-        s_scripts.start_spark = mock.Mock()
         c_get_instances.return_value = instances
         u_get_instances.return_value = instances
-        run.await_datanodes = mock.Mock()
-        run.start_dn_nm_processes = mock.Mock()
         self.vh._set_cluster_info = mock.Mock()
         self.vh.start_cluster(self.cluster)
         provision_keypairs.assert_called_once_with(self.cluster)