diff --git a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs b/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs
index b25a87ff65..34608a5fd3 100644
--- a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs
+++ b/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs
@@ -52,8 +52,9 @@ namespace Umbraco.Tests.DynamicDocument
 
 		protected override dynamic GetDynamicNode(int id)
 		{
-			var template = Template.MakeNew("test", new User(0));
-			var ctx = GetUmbracoContext("/test", template.Id);
+			//var template = Template.MakeNew("test", new User(0));
+			//var ctx = GetUmbracoContext("/test", template.Id);
+			var ctx = GetUmbracoContext("/test", 1234);
 			var contentStore = new DefaultPublishedContentStore();
 			var doc = contentStore.GetDocumentById(ctx, id);
 			Assert.IsNotNull(doc);
diff --git a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs b/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs
index 8dc6b37091..166e658d09 100644
--- a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs
+++ b/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs
@@ -12,6 +12,11 @@ namespace Umbraco.Tests.DynamicDocument
 	[TestFixture]
 	public abstract class DynamicDocumentTestsBase<TDocument, TDocumentList> : BaseWebTest
 	{
+		protected override bool RequiresDbSetup
+		{
+			get { return false; }
+		}
+
 		/// <summary>
 		/// Returns the dynamic node/document to run tests against
 		/// </summary>
diff --git a/src/Umbraco.Tests/DynamicDocument/DynamicNodeTests.cs b/src/Umbraco.Tests/DynamicDocument/DynamicNodeTests.cs
index 61a510001a..6f914817f2 100644
--- a/src/Umbraco.Tests/DynamicDocument/DynamicNodeTests.cs
+++ b/src/Umbraco.Tests/DynamicDocument/DynamicNodeTests.cs
@@ -33,8 +33,9 @@ namespace Umbraco.Tests.DynamicDocument
 
 		protected override dynamic GetDynamicNode(int id)
 		{
-			var template = Template.MakeNew("test", new User(0));
-			var ctx = GetUmbracoContext("/test", template.Id);
+			//var template = Template.MakeNew("test", new User(0));
+			//var ctx = GetUmbracoContext("/test", template.Id);
+			var ctx = GetUmbracoContext("/test", 1234);
 			var contentStore = new DefaultPublishedContentStore();
 			var node = new DynamicNode(
 				new DynamicBackingItem(
diff --git a/src/umbraco.interfaces/IApplicationStartupHandler.cs b/src/umbraco.interfaces/IApplicationStartupHandler.cs
index a442f9b100..cdf68110d4 100644
--- a/src/umbraco.interfaces/IApplicationStartupHandler.cs
+++ b/src/umbraco.interfaces/IApplicationStartupHandler.cs
@@ -5,6 +5,14 @@ using System.Text;
 
 namespace umbraco.interfaces
 {
+
+	/// <summary>
+	/// Any class that implements this interface will be instantiated at application startup
+	/// </summary>
+	/// <remarks>
+	/// NOTE: It is not recommended to use this interface and instead use IApplicationEventHandler
+	/// and bind to any custom events in the OnApplicationInitialized method.
+	/// </remarks>
 	public interface IApplicationStartupHandler
     { }
 }