diff --git a/server/test/com/cloud/hypervisor/KVMGuruTest.java b/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
similarity index 100%
rename from server/test/com/cloud/hypervisor/KVMGuruTest.java
rename to server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
diff --git a/server/test/com/cloud/network/guru/DirectNetworkGuruTest.java b/server/src/test/java/com/cloud/network/guru/DirectNetworkGuruTest.java
similarity index 100%
rename from server/test/com/cloud/network/guru/DirectNetworkGuruTest.java
rename to server/src/test/java/com/cloud/network/guru/DirectNetworkGuruTest.java
diff --git a/server/test/com/cloud/resource/ResourceManagerImplTest.java b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
similarity index 100%
rename from server/test/com/cloud/resource/ResourceManagerImplTest.java
rename to server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
diff --git a/server/test/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
similarity index 100%
rename from server/test/com/cloud/vm/UserVmManagerImplTest.java
rename to server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
diff --git a/server/test/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImplTest.java
similarity index 100%
rename from server/test/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImplTest.java
rename to server/src/test/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImplTest.java
diff --git a/server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithmTest.java b/server/src/test/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithmTest.java
similarity index 100%
rename from server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithmTest.java
rename to server/src/test/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithmTest.java
diff --git a/server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithmTest.java b/server/src/test/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithmTest.java
similarity index 100%
rename from server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithmTest.java
rename to server/src/test/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithmTest.java
diff --git a/server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithmTest.java b/server/src/test/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithmTest.java
similarity index 100%
rename from server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithmTest.java
rename to server/src/test/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithmTest.java