diff --git a/test/integration/plugins/nuagevsp/test_nuage_password_reset.py b/test/integration/plugins/nuagevsp/test_nuage_password_reset.py
index 28714a7d354..d506214fc49 100644
--- a/test/integration/plugins/nuagevsp/test_nuage_password_reset.py
+++ b/test/integration/plugins/nuagevsp/test_nuage_password_reset.py
@@ -120,7 +120,7 @@ class TestNuagePasswordReset(nuageTestCase):
 
     # stop_vm - Stops the given VM, and verifies its state
     def stop_vm(self, vm):
-        self.debug("Stoping VM")
+        self.debug("Stopping VM")
         vm.stop(self.api_client)
         list_vm_response = VirtualMachine.list(self.api_client,
                                                id=vm.id
@@ -330,12 +330,22 @@ class TestNuagePasswordReset(nuageTestCase):
                 vm_test_public_ip = public_ip_1
 
             self.debug("Resetting password for VM - %s" % vm_test.name)
+            self.stop_vm(vm_test)
             vm_test.password = vm_test.resetPassword(self.api_client)
             self.debug("Password reset to - %s" % vm_test.password)
 
             self.debug("Starting the VM")
             vm_test.start(self.api_client)
 
+            self.debug("until CLOUDSTACK-10380 is fixed, redo resetPassword")
+            self.stop_vm(vm_test)
+            self.debug("Resetting password again for VM - %s" % vm_test.name)
+            vm_test.password = vm_test.resetPassword(self.api_client)
+            self.debug("VM - %s password - %s !" %
+                       (vm_test.name, vm_test.password))
+            self.debug("Starting the VM again")
+            vm_test.start(self.api_client)
+
             self.debug("verifying that the guest VM template is password "
                        "enabled...")
             self.debug("VM - %s password - %s !" %
diff --git a/test/integration/plugins/nuagevsp/test_nuage_static_nat.py b/test/integration/plugins/nuagevsp/test_nuage_static_nat.py
index e611b97ae08..9f6cb5ea368 100644
--- a/test/integration/plugins/nuagevsp/test_nuage_static_nat.py
+++ b/test/integration/plugins/nuagevsp/test_nuage_static_nat.py
@@ -2088,6 +2088,7 @@ class TestNuageStaticNat(nuageTestCase):
         self.debug("Restarting the created VPC network with cleanup...")
         Network.restart(vpc_tier, self.api_client, cleanup=True)
         self.validate_Network(vpc_tier, state="Implemented")
+        vpc_vr = self.get_Router(vpc_tier)
         self.check_Router_state(vpc_vr, state="Running")
         self.check_VM_state(vpc_vm, state="Running")
 
diff --git a/test/integration/plugins/nuagevsp/test_nuage_vpc_internal_lb.py b/test/integration/plugins/nuagevsp/test_nuage_vpc_internal_lb.py
index f80dcb5cb5e..75c4387f340 100644
--- a/test/integration/plugins/nuagevsp/test_nuage_vpc_internal_lb.py
+++ b/test/integration/plugins/nuagevsp/test_nuage_vpc_internal_lb.py
@@ -1928,6 +1928,7 @@ class TestNuageInternalLb(nuageTestCase):
         self.debug("Restarting the Internal tier with cleanup...")
         Network.restart(internal_tier, self.api_client, cleanup=True)
         self.validate_Network(internal_tier, state="Implemented")
+        vr = self.get_Router(internal_tier)
         self.check_Router_state(vr, state="Running")
         self.check_VM_state(internal_vm, state="Running")
         self.check_VM_state(internal_vm_1, state="Running")
@@ -2011,6 +2012,7 @@ class TestNuageInternalLb(nuageTestCase):
         self.debug("Restarting the Public tier with cleanup...")
         Network.restart(public_tier, self.api_client, cleanup=True)
         self.validate_Network(public_tier, state="Implemented")
+        vr = self.get_Router(public_tier)
         self.check_Router_state(vr, state="Running")
         self.check_VM_state(public_vm, state="Running")
         self.validate_PublicIPAddress(