diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs
index e38e68560e..1b5aaab722 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadControlEventHandlerTestFixture.cs
@@ -46,11 +46,9 @@ namespace PythonBinding.Tests.Designer
 			}
 		}
 		
-		[TestFixtureSetUp]
-		public new void SetUpFixture()
+		public override void BeforeSetUpFixture()
 		{
 			base.ComponentCreator.SetEventPropertyDescriptor(new MockPropertyDescriptor("abc", "Button2KeyDown", true));
-			base.SetUpFixture();
 		}
 		
 		public Button GetButton()
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs
index 1d2abf5256..352e9d63ab 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadEventHandlerTestFixture.cs
@@ -36,11 +36,9 @@ namespace PythonBinding.Tests.Designer
 			}
 		}
 		
-		[TestFixtureSetUp]
-		public new void SetUpFixture()
+		public override void BeforeSetUpFixture()
 		{
 			base.ComponentCreator.SetEventPropertyDescriptor(new MockPropertyDescriptor("abc", "TestFormLoad", true));
-			base.SetUpFixture();
 		}		
 		
 		public EventDescriptor GetLoadEventDescriptor()
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs
index 3f1db57be3..74223894c4 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/LoadFormTestFixtureBase.cs
@@ -31,6 +31,7 @@ namespace PythonBinding.Tests.Designer
 		[TestFixtureSetUp]
 		public void SetUpFixture()
 		{			
+			BeforeSetUpFixture();
 			PythonComponentWalker walker = new PythonComponentWalker(componentCreator);
 			form = walker.CreateComponent(PythonCode) as Form;
 		}
@@ -41,6 +42,13 @@ namespace PythonBinding.Tests.Designer
 			form.Dispose();
 		}		
 
+		/// <summary>
+		/// Called at the start of SetUpFixture method before anything is setup.
+		/// </summary>
+		public virtual void BeforeSetUpFixture()
+		{
+		}
+		
 		/// <summary>
 		/// Gets the python code that will be loaded.
 		/// </summary>
diff --git a/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs b/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs
index df474df2f9..72920c8d2a 100644
--- a/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs
+++ b/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs
@@ -282,7 +282,7 @@ class A
 		{
 			ResourceResolveResult rrr = Resolve(CodeLocalCRMDeferredInitUsingApplyResources, 8, 20, null);
 			TestHelper.CheckReference(rrr, "A", null, "A", "A.B");
-			Assert.That(rrr, Is.InstanceOfType(typeof(ResourcePrefixResolveResult)));
+			Assert.That(rrr, Is.InstanceOf(typeof(ResourcePrefixResolveResult)));
 			ResourcePrefixResolveResult rprr = (ResourcePrefixResolveResult)rrr;
 			Assert.That(rprr.Prefix, Is.EqualTo("$this"), "Resource key prefix not detected correctly.");
 		}