diff --git a/core/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java
similarity index 100%
rename from core/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java
rename to vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java
diff --git a/core/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java
similarity index 99%
rename from core/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java
rename to vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java
index 2f239da46a3..2417ddf99de 100644
--- a/core/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java
+++ b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java
@@ -18,13 +18,13 @@ package com.cloud.hypervisor.vmware.mo;
 
 import java.util.GregorianCalendar;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.hypervisor.vmware.mo.SnapshotDescriptor.SnapshotInfo;
 import com.cloud.hypervisor.vmware.util.VmwareContext;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.utils.Pair;
-import com.cloud.utils.testcase.Log4jEnabledTestCase;
+import com.cloud.utils.testcase.Log4jEnabledTestCase;
 import com.google.gson.Gson;
 import com.vmware.vim25.DynamicProperty;
 import com.vmware.vim25.ManagedObjectReference;
diff --git a/core/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java b/vmware-base/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java
similarity index 100%
rename from core/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java
rename to vmware-base/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java
diff --git a/core/test/com/cloud/vmware/TestVMWare.java b/vmware-base/test/com/cloud/vmware/TestVMWare.java
similarity index 100%
rename from core/test/com/cloud/vmware/TestVMWare.java
rename to vmware-base/test/com/cloud/vmware/TestVMWare.java