diff --git a/ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributeTests.cs b/ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributeTests.cs
index d453e484f..76608c595 100644
--- a/ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributeTests.cs
+++ b/ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributeTests.cs
@@ -11,19 +11,19 @@ namespace ICSharpCode.Decompiler.Tests.CustomAttributes
 		[StaticTestFactory]
 		public static IEnumerable<Test> CustomAttributeSamples()
 		{			
-			return GenerateSectionTests(@"CustomAttributes\CustomAttributeSamples.cs");
+			return GenerateSectionTests(@"CustomAttributes\S_CustomAttributeSamples.cs");
 		}
 
 		[Test]
 		public void CustomAttributesMultiTest()
 		{
-			ValidateFileRoundtrip(@"CustomAttributes\CustomAttributes.cs");
+			ValidateFileRoundtrip(@"CustomAttributes\S_CustomAttributes.cs");
 		}
 
 		[Test]
 		public void AssemblyCustomAttributesMultiTest()
 		{
-			ValidateFileRoundtrip(@"CustomAttributes\AssemblyCustomAttribute.cs");
+			ValidateFileRoundtrip(@"CustomAttributes\S_AssemblyCustomAttribute.cs");
 		}
 	}
 }
diff --git a/ICSharpCode.Decompiler/Tests/CustomAttributes/AssemblyCustomAttribute.cs b/ICSharpCode.Decompiler/Tests/CustomAttributes/S_AssemblyCustomAttribute.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/CustomAttributes/AssemblyCustomAttribute.cs
rename to ICSharpCode.Decompiler/Tests/CustomAttributes/S_AssemblyCustomAttribute.cs
diff --git a/ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributeSamples.cs b/ICSharpCode.Decompiler/Tests/CustomAttributes/S_CustomAttributeSamples.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributeSamples.cs
rename to ICSharpCode.Decompiler/Tests/CustomAttributes/S_CustomAttributeSamples.cs
diff --git a/ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributes.cs b/ICSharpCode.Decompiler/Tests/CustomAttributes/S_CustomAttributes.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/CustomAttributes/CustomAttributes.cs
rename to ICSharpCode.Decompiler/Tests/CustomAttributes/S_CustomAttributes.cs
diff --git a/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj
index 51344082d..146aca67d 100644
--- a/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj
+++ b/ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj
@@ -54,16 +54,16 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Types\EnumSamples.cs" />
-    <None Include="CustomAttributes\AssemblyCustomAttribute.cs" />
+    <None Include="Types\S_EnumSamples.cs" />
+    <None Include="CustomAttributes\S_AssemblyCustomAttribute.cs" />
     <Compile Include="Helpers\RemoveCompilerAttribute.cs" />
     <Compile Include="Types\EnumTests.cs" />
     <Compile Include="Types\TypeTests.cs" />
-    <None Include="Types\DelegateConstruction.cs" />
-    <None Include="CustomAttributes\CustomAttributes.cs" />
+    <None Include="Types\S_DelegateConstruction.cs" />
+    <None Include="CustomAttributes\S_CustomAttributes.cs" />
     <None Include="Loops.cs" />
-    <None Include="Types\PropertiesAndEvents.cs" />
-    <None Include="CustomAttributes\CustomAttributeSamples.cs" />
+    <None Include="Types\S_PropertiesAndEvents.cs" />
+    <None Include="CustomAttributes\S_CustomAttributeSamples.cs" />
     <Compile Include="CodeSampleFileParser.cs" />
     <Compile Include="CustomAttributes\CustomAttributeTests.cs" />
     <Compile Include="DecompilerTestBase.cs" />
@@ -72,7 +72,7 @@
     <Compile Include="Generics.cs" />
     <Compile Include="MultidimensionalArray.cs" />
     <Compile Include="TestRunner.cs" />
-    <None Include="Types\ValueTypes.cs" />
+    <None Include="Types\S_ValueTypes.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Mono.Cecil\Mono.Cecil.csproj">
diff --git a/ICSharpCode.Decompiler/Tests/Types/EnumTests.cs b/ICSharpCode.Decompiler/Tests/Types/EnumTests.cs
index b4234f623..07af8968b 100644
--- a/ICSharpCode.Decompiler/Tests/Types/EnumTests.cs
+++ b/ICSharpCode.Decompiler/Tests/Types/EnumTests.cs
@@ -11,7 +11,7 @@ namespace ICSharpCode.Decompiler.Tests.Types
 		[StaticTestFactory]
 		public static IEnumerable<Test> EnumSamples()
 		{
-			return GenerateSectionTests(@"Types\EnumSamples.cs");
+			return GenerateSectionTests(@"Types\S_EnumSamples.cs");
 		}
 	}
 }
diff --git a/ICSharpCode.Decompiler/Tests/Types/DelegateConstruction.cs b/ICSharpCode.Decompiler/Tests/Types/S_DelegateConstruction.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/Types/DelegateConstruction.cs
rename to ICSharpCode.Decompiler/Tests/Types/S_DelegateConstruction.cs
diff --git a/ICSharpCode.Decompiler/Tests/Types/EnumSamples.cs b/ICSharpCode.Decompiler/Tests/Types/S_EnumSamples.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/Types/EnumSamples.cs
rename to ICSharpCode.Decompiler/Tests/Types/S_EnumSamples.cs
diff --git a/ICSharpCode.Decompiler/Tests/Types/PropertiesAndEvents.cs b/ICSharpCode.Decompiler/Tests/Types/S_PropertiesAndEvents.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/Types/PropertiesAndEvents.cs
rename to ICSharpCode.Decompiler/Tests/Types/S_PropertiesAndEvents.cs
diff --git a/ICSharpCode.Decompiler/Tests/Types/ValueTypes.cs b/ICSharpCode.Decompiler/Tests/Types/S_ValueTypes.cs
similarity index 100%
rename from ICSharpCode.Decompiler/Tests/Types/ValueTypes.cs
rename to ICSharpCode.Decompiler/Tests/Types/S_ValueTypes.cs
diff --git a/ICSharpCode.Decompiler/Tests/Types/TypeTests.cs b/ICSharpCode.Decompiler/Tests/Types/TypeTests.cs
index fca3ace99..3875edd1c 100644
--- a/ICSharpCode.Decompiler/Tests/Types/TypeTests.cs
+++ b/ICSharpCode.Decompiler/Tests/Types/TypeTests.cs
@@ -11,19 +11,19 @@ namespace ICSharpCode.Decompiler.Tests.Types
 		[Test]
 		public void ValueTypes()
 		{
-			ValidateFileRoundtrip(@"Types\ValueTypes.cs");
+			ValidateFileRoundtrip(@"Types\S_ValueTypes.cs");
 		}
 
 		[Test]
 		public void PropertiesAndEvents()
 		{
-			ValidateFileRoundtrip(@"Types\PropertiesAndEvents.cs");
+			ValidateFileRoundtrip(@"Types\S_PropertiesAndEvents.cs");
 		}
 
 		[Test]
 		public void DelegateConstruction()
 		{
-			ValidateFileRoundtrip(@"Types\DelegateConstruction.cs");
+			ValidateFileRoundtrip(@"Types\S_DelegateConstruction.cs");
 		}
 	}
 }