diff --git a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
index 203eb343e33..9343cd8d0c4 100644
--- a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
+++ b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
@@ -43,6 +43,7 @@ import com.cloud.domain.dao.DomainDao;
 import com.cloud.exception.AffinityConflictException;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
+import com.cloud.utils.db.DB;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.Transaction;
@@ -405,6 +406,7 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
         return true;
     }
 
+    @DB
     @Override
     public void handleDeleteGroup(AffinityGroup group) {
         // When a group of the 'ExplicitDedication' type gets deleted, make sure
diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
index 10e23d7a6d7..fbfeecc81df 100644
--- a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
+++ b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
@@ -52,6 +52,7 @@ import com.cloud.deploy.FirstFitPlanner;
 import com.cloud.deploy.PlannerHostReservationVO;
 import com.cloud.deploy.dao.PlannerHostReservationDao;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+import org.apache.cloudstack.affinity.AffinityGroupService;
 import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
 import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
@@ -362,6 +363,11 @@ public class DeploymentPlanningManagerImplTest {
             return Mockito.mock(VMReservationDao.class);
         }
 
+        @Bean
+        public AffinityGroupService affinityGroupService() {
+            return Mockito.mock(AffinityGroupService.class);
+        }
+
         public static class Library implements TypeFilter {
 
             @Override
diff --git a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
index c569e8a03bc..2013ff4e293 100644
--- a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
+++ b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
@@ -19,8 +19,11 @@ package org.apache.cloudstack.networkoffering;
 
 import java.io.IOException;
 
+import javax.inject.Inject;
 
 import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.affinity.AffinityGroupService;
+import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
 import org.apache.cloudstack.region.PortableIpDaoImpl;
 import org.apache.cloudstack.region.dao.RegionDaoImpl;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl;
@@ -353,6 +356,16 @@ public class ChildTestConfiguration {
         return Mockito.mock(DataStoreManager.class);
     }
 
+    @Bean
+    public AffinityGroupDao affinityGroupDao() {
+        return Mockito.mock(AffinityGroupDao.class);
+    }
+
+    @Bean
+    public AffinityGroupService affinityGroupService() {
+        return Mockito.mock(AffinityGroupService.class);
+    }
+
     public static class Library implements TypeFilter {
 
         @Override