diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs
index e0f2c802..6790efbb 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs
@@ -154,15 +154,18 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.LanguageServices
         [Fact]
         public void ServiceInitiailzation()
         {
-            InitializeTestServices();
+            try
+            {
+                InitializeTestServices();
+            }
+            catch (System.ArgumentException)
+            {
 
+            }
             Assert.True(LanguageService.Instance.Context != null);
             Assert.True(LanguageService.ConnectionServiceInstance != null);
             Assert.True(LanguageService.Instance.CurrentSettings != null);
             Assert.True(LanguageService.Instance.CurrentWorkspace != null);
-
-            LanguageService.ConnectionServiceInstance = null;
-            Assert.True(LanguageService.ConnectionServiceInstance == null);
         }        
 
         /// <summary>
@@ -178,15 +181,17 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.LanguageServices
             ScriptFile scriptFile = WorkspaceService<SqlToolsSettings>.Instance.Workspace.GetFile(sqlFilePath);
 
             string ownerUri = scriptFile.ClientFilePath;
-            var connectionService = TestObjects.GetTestConnectionService();
+            var connectionService = TestObjects.GetLiveTestConnectionService();
             var connectionResult =
                 connectionService
                 .Connect(new ConnectParams()
                 {
                     OwnerUri = ownerUri,
-                    Connection = TestObjects.GetTestConnectionDetails()
+                    Connection = TestObjects.GetIntegratedTestConnectionDetails()
                 });
             
+            connectionResult.Wait();
+
             ConnectionInfo connInfo = null;
             connectionService.TryFindConnection(ownerUri, out connInfo);
             
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs
index 67e48786..56a4b272 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-//#define USE_LIVE_CONNECTION
-
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -28,13 +26,14 @@ namespace Microsoft.SqlTools.Test.Utility
         /// </summary>
         public static ConnectionService GetTestConnectionService()
         {
-#if !USE_LIVE_CONNECTION
             // use mock database connection
             return new ConnectionService(new TestSqlConnectionFactory());
-#else
+        }
+
+        public static ConnectionService GetLiveTestConnectionService()
+        {
             // connect to a real server instance
             return ConnectionService.Instance;
-#endif
         }
 
         /// <summary>
@@ -65,9 +64,19 @@ namespace Microsoft.SqlTools.Test.Utility
             return new ConnectionDetails()
             {
                 UserName = "sa",
-                Password = "Yukon900",
-                DatabaseName = "AdventureWorks2016CTP3_2",
-                ServerName = "sqltools11"
+                Password = "...",
+                DatabaseName = "master",
+                ServerName = "localhost"
+            };
+        }
+
+         public static ConnectionDetails GetIntegratedTestConnectionDetails()
+        {
+            return new ConnectionDetails()
+            {
+                DatabaseName = "master",
+                ServerName = "localhost",
+                AuthenticationType = "Integrated"
             };
         }
 
@@ -85,14 +94,17 @@ namespace Microsoft.SqlTools.Test.Utility
         /// </summary>
         public static ISqlConnectionFactory GetTestSqlConnectionFactory()
         {
-#if !USE_LIVE_CONNECTION
             // use mock database connection
             return new TestSqlConnectionFactory();
-#else
+        }
+
+         /// <summary>
+        /// Creates a test sql connection factory instance
+        /// </summary>
+        public static ISqlConnectionFactory GetLiveTestSqlConnectionFactory()
+        {
             // connect to a real server instance
-            return ConnectionService.Instance.ConnectionFactory;
-#endif
-            
+            return ConnectionService.Instance.ConnectionFactory; 
         }
     }