diff --git a/data/templates/file/CSharp/CSharp.UnitTest.xft b/data/templates/file/CSharp/CSharp.UnitTest.xft
index 681585b541..3ba792369c 100644
--- a/data/templates/file/CSharp/CSharp.UnitTest.xft
+++ b/data/templates/file/CSharp/CSharp.UnitTest.xft
@@ -50,9 +50,9 @@
 		<File name="${FullName}" language="C#"><![CDATA[${StandardHeader.C#}
 <% if (ConditionalClass) { %>#if TEST
 <% } %>
+using System;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using System;
 
 namespace ${StandardNamespace}
 {
diff --git a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
index 89bdfdb5bd..b77a37d9fb 100644
--- a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
+++ b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
@@ -71,6 +71,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		}
 	}
 	
+	[Obsolete]
 	public class TemplateScript
 	{
 		string languageName;
@@ -150,7 +151,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		
 		List<FileDescriptionTemplate> files = new List<FileDescriptionTemplate>();
 		List<TemplateProperty> properties  = new List<TemplateProperty>();
-		List<TemplateScript> scripts = new List<TemplateScript>();
 		List<TemplateType> customTypes = new List<TemplateType>();
 		
 		XmlElement fileoptions = null;
@@ -244,15 +244,17 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 			}
 		}
 		
+		[Obsolete]
 		public List<TemplateScript> Scripts {
 			get {
-				return scripts;
+				return new List<TemplateScript>();
 			}
 		}
 		
+		[Obsolete]
 		public bool HasScripts {
 			get {
-				return scripts != null && scripts.Count > 0;
+				return false;
 			}
 		}
 		
@@ -314,13 +316,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 					this.files.Add(new FileDescriptionTemplate((XmlElement)filenode, Path.GetDirectoryName(filename)));
 				}
 			}
-			
-			// load scripts (if any)
-			XmlNodeList scriptList = doc.DocumentElement.SelectNodes("Script");
-			foreach (XmlElement scriptElement in scriptList) {
-				this.scripts.Add(new TemplateScript(scriptElement));
-			}
-			
 		}
 		
 		static FileTemplate()
diff --git a/src/Main/Base/Test/CollectionClassOverridesTestFixture.cs b/src/Main/Base/Test/CollectionClassOverridesTestFixture.cs
index d9d81df34d..604111d2dd 100644
--- a/src/Main/Base/Test/CollectionClassOverridesTestFixture.cs
+++ b/src/Main/Base/Test/CollectionClassOverridesTestFixture.cs
@@ -95,6 +95,9 @@ namespace ICSharpCode.SharpDevelop.Tests
 			expectedMethodNames.Add("RemoveItem");
 			expectedMethodNames.Add("SetItem");
 			
+			methodNames.Sort();
+			expectedMethodNames.Sort();
+			
 			Assert.AreEqual(expectedMethodNames.ToArray(), methodNames.ToArray());
 		}