diff --git a/build/developer.xml b/build/developer.xml
index 52c6866869c..c616a01f9d8 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -335,11 +335,6 @@
           <include name="**/${test}.java"/>
         </fileset>
       </batchtest>
-      <junitreport todir="${unittest.dir}">
-        <fileset dir="${unittest.dir}"/>
-        <report todir="${unittest.dir}/test-reports"/>
-      </junitreport>
-      <fail if="junit.failure" message="Unit test(s) failed.  See reports!"/>
     </junit>
     <junitreport todir="${unittest.dir}">
       <fileset dir="${unittest.dir}"/>
diff --git a/setup/db/db/schema-2211to2212.sql b/setup/db/db/schema-2211to2212.sql
index f7dab355755..35631aff68d 100644
--- a/setup/db/db/schema-2211to2212.sql
+++ b/setup/db/db/schema-2211to2212.sql
@@ -17,6 +17,9 @@ DELETE FROM `cloud`.`configuration` where name='vmware.guest.nic.device.type';
 INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.lb.enabled', 'true', 'If agent load balancing enabled in cluster setup');
 
 update `cloud`.`vm_template` set hypervisor_type='XenServer' where unique_name='xs-tools.iso';
-
-ALTER TABLE `cloud`.`host` MODIFY COLUMN  `storage_ip_address` char(40);
-
+
+ALTER TABLE `cloud`.`host` MODIFY COLUMN  `storage_ip_address` char(40);
+
+ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_accountId`(`type`, `account_id`);
+ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintId`(`type`, `domain_id`);
+