diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
index d14725f4508..23b64eef45f 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
@@ -121,7 +121,6 @@ public class NsxGuestNetworkGuruTest {
     NetworkOfferingDao networkOfferingDao;
 
     NsxGuestNetworkGuru guru;
-    GuestNetworkGuru guestNetworkGuru;
     AutoCloseable closeable;
 
     @Before
@@ -249,10 +248,7 @@ public class NsxGuestNetworkGuruTest {
         when(network.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
         when(vmProfile.getVirtualMachine()).thenReturn(virtualMachine);
         when(virtualMachine.getType()).thenReturn(VirtualMachine.Type.User);
-//        when(network.getId()).thenReturn(2L);
-//        when(offering.getId()).thenReturn(11L);
         when(networkModel.getNetworkIp4Dns(any(Network.class), nullable(DataCenter.class))).thenReturn(dns);
-//        when(networkModel.getNextAvailableMacAddressInNetwork(anyLong())).thenReturn(macAddress);
         when(nicProfile.getMacAddress()).thenReturn(macAddress);
         when(networkOfferingDao.isIpv6Supported(anyLong())).thenReturn(false);
 
diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
index 03809bd283c..da21bf11b64 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
@@ -160,6 +160,7 @@ public class NsxPublicNetworkGuruTest {
         when(ipAddressDao.listByAssociatedVpc(12L, true)).thenReturn(sourceNatList);
         when(vlanDetailsDao.findDetail(anyLong(), anyString())).thenReturn(vlanDetailVO);
         when(vpcVO.getVpcOfferingId()).thenReturn(12L);
+        when(vpcVO.getId()).thenReturn(12L);
         when(vpcVO.getName()).thenReturn("nsxVPCNet");
         when(vpcOfferingServiceMapDao.areServicesSupportedByVpcOffering(anyLong(), any())).thenReturn(true);
         when(nsxService.createVpcNetwork(anyLong(), anyLong(), anyLong(), anyLong(), anyString(), anyBoolean())).thenReturn(true);