diff --git a/client/pom.xml b/client/pom.xml
index ab758eb2a67..047cef8e651 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -590,6 +590,7 @@
         </dependency>
       </dependencies>
     </profile>
+<!--  
     <profile>
       <id>netapp</id>
       <activation>
@@ -650,6 +651,7 @@
         </dependency>
       </dependencies>
     </profile>
+-->    
     <profile>
       <id>vmware</id>
       <activation>
diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
index de08c93c78a..f169fe535f1 100644
--- a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
+++ b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
@@ -32,6 +32,7 @@ import junit.framework.TestCase;
 
 import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
 import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
+import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.test.utils.SpringUtils;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -89,7 +90,7 @@ import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountService;
 import com.cloud.user.AccountVO;
-import com.cloud.user.UserContext;
+import com.cloud.user.UserVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -175,7 +176,7 @@ public class VmwareDatacenterApiUnitTest {
         acct.setType(Account.ACCOUNT_TYPE_ADMIN);
         acct.setAccountName("admin");
         acct.setDomainId(domainId);
-        UserContext.registerContext(1, acct, null, true);
+        CallContext.register(new UserVO(1), new AccountVO(2L), null);
 
         when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct);