diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/Program.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/Program.cs
deleted file mode 100644
index cac606c88f..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- Console.
- }
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/Properties/AssemblyInfo.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2121d05e99..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/testy.csproj b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/testy.csproj
deleted file mode 100644
index e8b5f0cffc..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/not-testy/testy.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/solution-named-like-folder.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/solution-named-like-folder.sln
deleted file mode 100644
index 4fb02619aa..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/solution-named-like-folder.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = not-testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs
deleted file mode 100644
index b4d0073db1..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- int 九 = 9;
- Console.
- }
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2121d05e99..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj
deleted file mode 100644
index e8b5f0cffc..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/.ycm_extra_conf.py b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/.ycm_extra_conf.py
deleted file mode 100644
index 54261e6531..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/.ycm_extra_conf.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-import os
-
-def CSharpSolutionFile( path, **kwargs ):
- #remove '.ycm_extra_conf.py' and 'extra-conf-abs' from filename
- location=os.path.dirname( __file__ )
- location=os.path.dirname( location )
- return os.path.join( location, 'testy2.sln' )
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/Program.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/Program.cs
deleted file mode 100644
index cac606c88f..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- Console.
- }
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/Properties/AssemblyInfo.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2121d05e99..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/testy.csproj b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/testy.csproj
deleted file mode 100644
index e8b5f0cffc..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy/testy.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy2.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy2.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-abs/testy2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/.ycm_extra_conf.py b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/.ycm_extra_conf.py
deleted file mode 100644
index 22c2901ac7..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/.ycm_extra_conf.py
+++ /dev/null
@@ -1,4 +0,0 @@
-
-def CSharpSolutionFile( path, **kwargs ):
- return "nosuch.sln"
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/Program.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/Program.cs
deleted file mode 100644
index cac606c88f..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- Console.
- }
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/Properties/AssemblyInfo.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2121d05e99..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/testy.csproj b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/testy.csproj
deleted file mode 100644
index e8b5f0cffc..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy/testy.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy2.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy2.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-bad/testy2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/.ycm_extra_conf.py b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/.ycm_extra_conf.py
deleted file mode 100644
index aaa3193ec5..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/.ycm_extra_conf.py
+++ /dev/null
@@ -1,4 +0,0 @@
-
-def CSharpSolutionFile( path, **kwargs ):
- return "testy2.sln"
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/Program.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/Program.cs
deleted file mode 100644
index cac606c88f..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- Console.
- }
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/Properties/AssemblyInfo.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2121d05e99..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/testy.csproj b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/testy.csproj
deleted file mode 100644
index e8b5f0cffc..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/testy.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/testy2.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/testy2.sln
deleted file mode 100644
index fff2c0f590..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy/testy2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy2.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy2.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/extra-conf-rel/testy2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs
deleted file mode 100644
index cac606c88f..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- Console.
- }
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2121d05e99..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj
deleted file mode 100644
index e8b5f0cffc..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln b/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln
deleted file mode 100644
index 82e3d1557a..0000000000
--- a/ycmd/tests/cs/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testy", "testy/testy.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = testy/testy.csproj
- EndGlobalSection
-EndGlobal
diff --git a/ycmd/tests/cs/testdata/testy/DiagnosticRange.cs b/ycmd/tests/cs/testdata/testy/DiagnosticRange.cs
deleted file mode 100644
index 2fc22e2bd5..0000000000
--- a/ycmd/tests/cs/testdata/testy/DiagnosticRange.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Class
-{
- public int attribute;
- public static void Main (string[] args)
- {
- int 九 = 9;
- }
-}
diff --git a/ycmd/tests/cs/testdata/testy/MaxDiagnostics.cs b/ycmd/tests/cs/testdata/testy/MaxDiagnostics.cs
deleted file mode 100644
index ed5a2174c0..0000000000
--- a/ycmd/tests/cs/testdata/testy/MaxDiagnostics.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-public class MaxDiagnostics
-{
- public int test;
- public int test;
- public int test;
-}
diff --git a/ycmd/tests/cs/testdata/testy/ZeroColumnDiagnostic.cs b/ycmd/tests/cs/testdata/testy/ZeroColumnDiagnostic.cs
deleted file mode 100644
index 7e08027751..0000000000
--- a/ycmd/tests/cs/testdata/testy/ZeroColumnDiagnostic.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-class Class{
- int Method()
-}
diff --git "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/Program.cs" "b/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/Program.cs"
deleted file mode 100644
index cac606c88f..0000000000
--- "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/Program.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace testy
-{
- class MainClass
- {
- public static void Main (string[] args)
- {
- Console.
- }
- }
-}
diff --git "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/Properties/AssemblyInfo.cs" "b/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/Properties/AssemblyInfo.cs"
deleted file mode 100644
index 2121d05e99..0000000000
--- "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/Properties/AssemblyInfo.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-[assembly: AssemblyTitle ("testy")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("valloric")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.0.*")]
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.csproj" "b/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.csproj"
deleted file mode 100644
index 800f5a87a7..0000000000
--- "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.csproj"
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Debug
- x86
- 10.0.0
- 2.0
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}
- Exe
- testy
- testy
- v4.8
-
-
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- true
- x86
-
-
- full
- true
- bin\Release
- prompt
- 4
- true
- x86
-
-
-
-
-
-
-
-
-
-
diff --git "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.sln" "b/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.sln"
deleted file mode 100644
index fc10298766..0000000000
--- "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.sln"
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "a project", "a project.csproj", "{0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.ActiveCfg = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Debug|x86.Build.0 = Debug|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.ActiveCfg = Release|x86
- {0C99F719-E00E-4CCD-AB9F-FEFBCD97C51F}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = a project.csproj
- EndGlobalSection
-EndGlobal
diff --git "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.userprefs" "b/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.userprefs"
deleted file mode 100644
index 1895a66a4d..0000000000
--- "a/ycmd/tests/cs/testdata/\320\275\320\265\320\277\321\200\320\270\320\273\320\270\321\207\320\275\320\276\320\265 \321\201\320\273\320\276\320\262\320\276/a project.userprefs"
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file