diff --git a/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.HSQLDialect/create-activities-tables.sql b/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.HSQLDialect/create-activities-tables.sql
index 8abb15689b..692324c7dc 100644
--- a/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.HSQLDialect/create-activities-tables.sql
+++ b/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.HSQLDialect/create-activities-tables.sql
@@ -57,3 +57,15 @@ CREATE TABLE alf_activity_feed_control (
 );
 
 CREATE INDEX feedcontroluserid_idx ON alf_activity_feed_control(feed_user_id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-0-CreateActivitiesTables';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.0-0-CreateActivitiesTables', 'Executed script create V3.0: Created activities tables',
+    0, 125, -1, 126, null, 'UNKNOWN', 1, 1, 'Script completed'
+  );
diff --git a/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.MySQLInnoDBDialect/create-activities-tables.sql b/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.MySQLInnoDBDialect/create-activities-tables.sql
index 8698e3ebb6..60bc073a2f 100644
--- a/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.MySQLInnoDBDialect/create-activities-tables.sql
+++ b/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.MySQLInnoDBDialect/create-activities-tables.sql
@@ -54,3 +54,15 @@ CREATE TABLE alf_activity_feed_control (
   PRIMARY KEY (id),
   KEY feedcontroluserid_idx (feed_user_id)
 ) type=InnoDB;
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-0-CreateActivitiesTables';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.0-0-CreateActivitiesTables', 'Executed script create V3.0: Created activities tables',
+    0, 125, -1, 126, null, 'UNKNOWN', 1, 1, 'Script completed'
+  );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.Oracle9Dialect/create-activities-tables.sql b/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.Oracle9Dialect/create-activities-tables.sql
index 34b9f389ff..c604aa8307 100644
--- a/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.Oracle9Dialect/create-activities-tables.sql
+++ b/config/alfresco/dbscripts/create/3.0/org.hibernate.dialect.Oracle9Dialect/create-activities-tables.sql
@@ -63,3 +63,15 @@ CREATE TABLE alf_activity_feed_control (
 CREATE SEQUENCE alf_activity_feed_control_seq START WITH 1 INCREMENT BY 1;
 
 CREATE INDEX feedcontroluserid_idx ON alf_activity_feed_control(feed_user_id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-0-CreateActivitiesTables';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.0-0-CreateActivitiesTables', 'Executed script create V3.0: Created activities tables',
+    0, 125, -1, 126, null, 'UNKNOWN', 1, 1, 'Script completed'
+  );
diff --git a/source/java/org/alfresco/util/BaseSpringTest.java b/source/java/org/alfresco/util/BaseSpringTest.java
index 8943daa857..5a1f7a54dc 100644
--- a/source/java/org/alfresco/util/BaseSpringTest.java
+++ b/source/java/org/alfresco/util/BaseSpringTest.java
@@ -52,6 +52,10 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
 	 */
     public BaseSpringTest()
     {
+        // TODO temporarily switch default to auto-wire by name
+        this.setAutowireMode(AUTOWIRE_BY_NAME);
+        //this.setDependencyCheck(false);
+        
         defaultContext = false;
     }
     
@@ -96,9 +100,6 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
         // The derived class is using the default context
         defaultContext = true;
         
-        this.setAutowireMode(AUTOWIRE_BY_NAME);
-        //this.setDependencyCheck(false);
-        
         if (logger.isDebugEnabled())
         {
             logger.debug("Getting config locations");