diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 4434af3f1a..90ab79f98a 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -165,7 +165,6 @@ Manual Tests require the below setup to run:
|TCPConnectionString | Connection String for a TCP enabled SQL Server instance. | `Server={servername};Database={Database_Name};Trusted_Connection=True;`
OR `Data Source={servername};Initial Catalog={Database_Name};Integrated Security=True;`|
|NPConnectionString | Connection String for a Named Pipes enabled SQL Server instance.| `Server=\\{servername}\pipe\sql\query;Database={Database_Name};Trusted_Connection=True;`
OR
`Data Source=np:{servername};Initial Catalog={Database_Name};Integrated Security=True;`|
|TCPConnectionStringHGSVBS | (Optional) Connection String for a TCP enabled SQL Server with Host Guardian Service (HGS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = HGS; Enclave Attestation Url = {AttestationURL};`|
- |TCPConnectionStringAASVBS | (Optional) Connection String for a TCP enabled SQL Server with a VBS Enclave and using Microsoft Azure Attestation (AAS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = AAS; Enclave Attestation Url = {AttestationURL};`|
|TCPConnectionStringNoneVBS | (Optional) Connection String for a TCP enabled SQL Server with a VBS Enclave and using None Attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = NONE;`|
|TCPConnectionStringAASSGX | (Optional) Connection String for a TCP enabled SQL Server with a SGX Enclave and using Microsoft Azure Attestation (AAS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = AAS; Enclave Attestation Url = {AttestationURL};`|
|EnclaveEnabled | Enables tests requiring an enclave-configured server.|
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index d588761bdb..a486046b84 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -30,7 +30,6 @@ public static class DataTestUtility
public static readonly string NPConnectionString = null;
public static readonly string TCPConnectionString = null;
public static readonly string TCPConnectionStringHGSVBS = null;
- public static readonly string TCPConnectionStringAASVBS = null;
public static readonly string TCPConnectionStringNoneVBS = null;
public static readonly string TCPConnectionStringAASSGX = null;
public static readonly string AADAuthorityURL = null;
@@ -144,7 +143,6 @@ static DataTestUtility()
NPConnectionString = c.NPConnectionString;
TCPConnectionString = c.TCPConnectionString;
TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
- TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
TCPConnectionStringNoneVBS = c.TCPConnectionStringNoneVBS;
TCPConnectionStringAASSGX = c.TCPConnectionStringAASSGX;
AADAuthorityURL = c.AADAuthorityURL;
@@ -205,11 +203,6 @@ static DataTestUtility()
AEConnStringsSetup.Add(TCPConnectionStringHGSVBS);
}
- if (!string.IsNullOrEmpty(TCPConnectionStringAASVBS))
- {
- AEConnStrings.Add(TCPConnectionStringAASVBS);
- }
-
if (!string.IsNullOrEmpty(TCPConnectionStringNoneVBS))
{
AEConnStrings.Add(TCPConnectionStringNoneVBS);
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
index 6a936ac5a1..52bf5c30f4 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
@@ -24,7 +24,6 @@ public static class SqlDbManager
private const string TCPConnectionString = "TCPConnectionString";
private const string NPConnectionString = "NPConnectionString";
private const string TCPConnectionStringAASSGX = "TCPConnectionStringAASSGX";
- private const string TCPConnectionStringAASVBS = "TCPConnectionStringAASVBS";
private const string TCPConnectionStringHGSVBS = "TCPConnectionStringHGSVBS";
///
@@ -124,10 +123,6 @@ private static void LoadActiveConnectionStrings()
{
s_activeConnectionStrings.Add(TCPConnectionStringAASSGX, s_configJson.TCPConnectionStringAASSGX);
}
- if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringAASVBS))
- {
- s_activeConnectionStrings.Add(TCPConnectionStringAASVBS, s_configJson.TCPConnectionStringAASVBS);
- }
if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringHGSVBS))
{
s_activeConnectionStrings.Add(TCPConnectionStringHGSVBS, s_configJson.TCPConnectionStringHGSVBS);
@@ -148,9 +143,6 @@ private static void UpdateConfig(string key, SqlConnectionStringBuilder builder)
case TCPConnectionStringAASSGX:
s_configJson.TCPConnectionStringAASSGX = builder.ConnectionString;
break;
- case TCPConnectionStringAASVBS:
- s_configJson.TCPConnectionStringAASVBS = builder.ConnectionString;
- break;
case TCPConnectionStringHGSVBS:
s_configJson.TCPConnectionStringHGSVBS = builder.ConnectionString;
break;
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
index 49c368c790..3a5c6c6e11 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
@@ -13,7 +13,6 @@ public class Config
public string TCPConnectionString = null;
public string NPConnectionString = null;
public string TCPConnectionStringHGSVBS = null;
- public string TCPConnectionStringAASVBS = null;
public string TCPConnectionStringNoneVBS = null;
public string TCPConnectionStringAASSGX = null;
public string AADAuthorityURL = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
index 411f4ad88f..6896f12258 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
@@ -2,7 +2,6 @@
"TCPConnectionString": "Data Source=tcp:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
"NPConnectionString": "Data Source=np:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
"TCPConnectionStringHGSVBS": "",
- "TCPConnectionStringAASVBS": "",
"TCPConnectionStringNoneVBS": "",
"TCPConnectionStringAASSGX": "",
"EnclaveEnabled": false,