diff --git a/ycmd/tests/cs/debug_info_test.py b/ycmd/tests/cs/debug_info_test.py
index 8f6258ffbd..7774bbcc52 100644
--- a/ycmd/tests/cs/debug_info_test.py
+++ b/ycmd/tests/cs/debug_info_test.py
@@ -95,7 +95,7 @@ def test_DebugInfo_ServerIsRunning( self, app ):
 
 
   @SharedYcmd
-  def test_DebugInfo_ServerIsNotRunning_NoSolution( self, app ):
+  def test_DebugInfo_ServerIsRunning_NoSolution( self, app ):
     request_data = BuildRequest( filetype = 'cs' )
     assert_that(
       app.post_json( '/debug_info', request_data ).json,
@@ -103,12 +103,13 @@ def test_DebugInfo_ServerIsNotRunning_NoSolution( self, app ):
         'name': 'C#',
         'servers': contains_exactly( has_entries( {
           'name': 'OmniSharp',
-          'is_running': False,
+          'is_running': True,
           'executable': instance_of( str ),
-          'pid': None,
-          'address': None,
-          'port': None,
-          'logfiles': empty()
+          'pid': instance_of( int ),
+          'address': instance_of( str ),
+          'port': instance_of( int ),
+          'logfiles': contains_exactly( instance_of( str ),
+                                instance_of( str ) )
         } ) ),
         'items': empty()
       } ) )
diff --git a/ycmd/tests/cs/get_completions_test.py b/ycmd/tests/cs/get_completions_test.py
index a992d96bda..9e3756b1d7 100644
--- a/ycmd/tests/cs/get_completions_test.py
+++ b/ycmd/tests/cs/get_completions_test.py
@@ -172,24 +172,3 @@ def test_GetCompletions_PathWithSpace( self, app ):
           ),
           'errors': empty(),
         } ) )
-
-
-  @SharedYcmd
-  def test_GetCompletions_DoesntStartWithAmbiguousMultipleSolutions(
-      self, app ):
-    filepath = PathToTestFile( 'testy-multiple-solutions',
-                               'solution-not-named-like-folder',
-                               'testy', 'Program.cs' )
-    contents = ReadFile( filepath )
-    event_data = BuildRequest( filepath = filepath,
-                               filetype = 'cs',
-                               contents = contents,
-                               event_name = 'FileReadyToParse' )
-
-    assert_that(
-      calling( app.post_json ).with_args( '/event_notification', event_data ),
-      raises( AppError, 'Autodetection of solution file failed' ),
-      "The Omnisharp server started, despite us not being able to find a "
-      "suitable solution file to feed it. Did you fiddle with the solution "
-      "finding code in cs_completer.py? Hopefully you've enhanced it: you need "
-      "to update this test then :)" )