diff --git a/test/JDBC/expected/test_windows_login-vu-prepare.out b/test/JDBC/expected/test_windows_login-vu-prepare.out
index 6cb5a741ec..1edefb9eb2 100644
--- a/test/JDBC/expected/test_windows_login-vu-prepare.out
+++ b/test/JDBC/expected/test_windows_login-vu-prepare.out
@@ -1,5 +1,4 @@
 -- psql
--- TODO: BABEL-5349
 do 
 $$ begin 
     if not exists (select * from pg_catalog.pg_roles where rolname = 'rds_ad') 
diff --git a/test/JDBC/expected/test_windows_login_before-16_6-vu-cleanup.out b/test/JDBC/expected/test_windows_login_before-16_6-vu-cleanup.out
new file mode 100644
index 0000000000..870cf9753e
--- /dev/null
+++ b/test/JDBC/expected/test_windows_login_before-16_6-vu-cleanup.out
@@ -0,0 +1,91 @@
+-- tsql
+DROP LOGIN PassWordUser;
+GO
+
+-- test for drop login with upn format
+DROP LOGIN [aduser@AD];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Cannot drop the login 'aduser@ad', because it does not exist or you do not have permission.)~~
+
+
+DROP LOGIN [ad\adUSer];
+GO
+
+DROP LOGIN [ad\aduserDB];
+GO
+
+DROP LOGIN [ad\Aduserlanguage];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Cannot drop the login 'aduserlanguage@AD', because it does not exist or you do not have permission.)~~
+
+
+DROP LOGIN [ad\Aduserdblanguage];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Cannot drop the login 'aduserdblanguage@AD', because it does not exist or you do not have permission.)~~
+
+
+DROP LOGIN [ad\AduserdbEnglish];
+GO
+
+DROP LOGIN [ad\Aduseroption];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Cannot drop the login 'aduseroption@AD', because it does not exist or you do not have permission.)~~
+
+
+DROP LOGIN [babel\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Cannot drop the login 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@BABEL', because it does not exist or you do not have permission.)~~
+
+
+DROP LOGIN [ba.bel\username];
+GO
+
+-- test for non-existent login
+DROP LOGIN [babel\non_existent_login]
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Cannot drop the login 'non_existent_login@BABEL', because it does not exist or you do not have permission.)~~
+
+
+-- drop login with different casing
+DROP LOGIN UserPassword;
+GO
+
+DROP LOGIN [BabeL\DupLicate];
+GO
+
+DROP LOGIN [Babel\DuplicateDefaultDB];
+GO
+
+-- test drop logins for logins with different language names
+-- Arabic
+DROP LOGIN [babel\كلب];
+GO
+
+-- Mongolian
+DROP LOGIN [babel\өглөө];
+GO
+
+-- Greek
+DROP LOGIN [babel\ελπίδα];
+GO
+
+-- Chinese
+DROP LOGIN [babel\爱];
+GO
+
+DROP DATABASE ad_db;
+GO
+
+
diff --git a/test/JDBC/expected/test_windows_login_before-16_6-vu-prepare.out b/test/JDBC/expected/test_windows_login_before-16_6-vu-prepare.out
new file mode 100644
index 0000000000..1edefb9eb2
--- /dev/null
+++ b/test/JDBC/expected/test_windows_login_before-16_6-vu-prepare.out
@@ -0,0 +1,498 @@
+-- psql
+do 
+$$ begin 
+    if not exists (select * from pg_catalog.pg_roles where rolname = 'rds_ad') 
+        then create role rds_ad NOSUPERUSER NOLOGIN NOCREATEROLE INHERIT NOREPLICATION; 
+    end if; 
+end $$;
+GO
+-- terminate-psql-conn
+
+-- tsql
+CREATE DATABASE ad_db;
+GO
+
+CREATE LOGIN PassWordUser with PASSWORD='123';
+GO
+
+-- positive test case
+CREATE LOGIN [ad\Aduser] from windows;
+GO
+
+-- test for default database
+CREATE LOGIN [ad\Aduserdb] from windows with default_database=[ad_db];
+GO
+
+-- test for default language
+CREATE LOGIN [ad\Aduserlanguage] from windows with default_language=[German];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: '[German]' is not currently supported in Babelfish. please use babelfishpg_tsql.escape_hatch_language_non_english to ignore)~~
+
+
+-- test for default database and default language
+CREATE LOGIN [ad\Aduserdblanguage] from windows with default_database=[ad_db], default_language=[German];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: '[German]' is not currently supported in Babelfish. please use babelfishpg_tsql.escape_hatch_language_non_english to ignore)~~
+
+
+CREATE LOGIN [ad\AduserdbEnglish] from windows with default_database=[ad_db], default_language=[English];
+GO
+
+-- test for invalid options for windows
+CREATE LOGIN [ad\Aduseroption] from windows with CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: syntax error near '=' at line 2 and character position 62)~~
+
+
+
+-- test boundary conditions
+-- test for when the login_name is greater than 21 characters
+create login [babel\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The login name 'babel\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' has invalid length. Login name length should be between 1 and 20 for windows login.)~~
+
+
+-- test for when the login_name length is 0
+CREATE LOGIN [babel\] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The login name 'babel\' has invalid length. Login name length should be between 1 and 20 for windows login.)~~
+
+
+--test for when the total login name, i.e., domain+user is greater than 64
+CREATE LOGIN [babelforapg.individualad.testfornumberofcharactersintotalwhichisnotallowedinpostgres\user] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The login name 'user@BABELFORAPG.INDIVIDUALAD.TESTFORNUMBEROFCHARACTERSINTOTALWHICHISNOTALLOWEDINPOSTGRES' is too long. Maximum length is 63.)~~
+
+
+-- test for when the login_name contains invalid characters
+CREATE LOGIN [babeluser] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babeluser' is not a valid Windows NT name. Give the complete name: <domain\username>.)~~
+
+CREATE LOGIN [babel\user\] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user\' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us\er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us\er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user/] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user/' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us/er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us/er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user[] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user[' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\u[ser] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\u[ser' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\use]r] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: syntax error near 'r' at line 1 and character position 24)~~
+
+CREATE LOGIN [babel\user;] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user;' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us;er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us;er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user:] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user:' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us:er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us:er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user|] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user|' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\use|r] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\use|r' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user=] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user=' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\u=ser] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\u=ser' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user,] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user,' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us,er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us,er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user+] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user+' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\u+ser] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\u+ser' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user*] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user*' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user*] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user*' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user?] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user?' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us?er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us?er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user>] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user>' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\u>ser] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\u>ser' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user<] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user<' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us<er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us<er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\user@] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\user@' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us@er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us@er' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us\er@] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us\er@' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [babel\us<>er] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'babel\us<>er' is not a valid name because it contains invalid characters.)~~
+
+
+-- test to show UPN format is not allowed
+CREATE LOGIN [user@BABEL] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'user@BABEL' is not a valid Windows NT name. Give the complete name: <domain\username>.)~~
+
+
+-- test for duplicate login
+CREATE LOGIN usErpassWord with PASSWORD = '123';
+GO
+
+CREATE LOGIN UserPassword with PASSWORD = '098'; 
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The Server principal 'userpassword' already exists)~~
+
+
+CREATE LOGIN [babel\duplicate] from windows;
+GO
+
+CREATE LOGIN [BabeL\DupLicate] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The Server principal 'duplicate@BABEL' already exists)~~
+
+
+CREATE LOGIN [babel\duplicatedefaultdb] from windows with default_database=[master];
+GO
+
+CREATE LOGIN [Babel\DuplicateDefaultDB] from windows with default_database=[ad_db];
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The Server principal 'duplicatedefaultdb@BABEL' already exists)~~
+
+
+-- test for empty domain name
+CREATE LOGIN [\adnodomain] from windows;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: The login name '\adnodomain' is invalid. The domain can not be empty.)~~
+
+
+
+-- test for login names with different language
+-- Arabic
+CREATE LOGIN [babel\كلب] from windows;
+GO
+
+-- Mongolian
+CREATE LOGIN [babel\өглөө] from windows;
+GO
+
+-- Greek
+CREATE LOGIN [babel\ελπίδα] from windows;
+GO
+
+-- Chinese
+CREATE LOGIN [babel\爱] from windows;
+GO
+
+-- test for windows login with password --> should throw error
+CREATE LOGIN [babel\adbabel] from windows with password='1234';
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: syntax error near '=' at line 2 and character position 55)~~
+
+
+-- test for when the domain name contains invalid characters
+CREATE LOGIN [<script>!@#$%^&*()\idontexist2] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: '<script>!@#$%^&*()\idontexist2' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba,bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba,bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba~el\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba~el\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba:bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba:bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba!bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba!bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba@bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba@bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba#bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba#bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba$bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba$bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba%bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba%bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba_bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba_bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba^bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba^bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba"bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba"bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba'bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba'bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba(bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba(bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba)bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba)bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba{bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba{bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba}bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba}bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba\bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba\bel\username' is not a valid name because it contains invalid characters.)~~
+
+CREATE LOGIN [ba/bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba/bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba<bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba<bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba>bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba>bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba&bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba&bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba*bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba*bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba|bel\username] FROM WINDOWS;
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'ba|bel\username' is not valid because the domain name contains invalid characters.)~~
+
+CREATE LOGIN [ba.bel\username] FROM WINDOWS;
+GO
diff --git a/test/JDBC/expected/test_windows_login_before-16_6-vu-verify.out b/test/JDBC/expected/test_windows_login_before-16_6-vu-verify.out
new file mode 100644
index 0000000000..f09f266b3b
--- /dev/null
+++ b/test/JDBC/expected/test_windows_login_before-16_6-vu-verify.out
@@ -0,0 +1,210 @@
+-- psql
+select rolname, orig_loginname, type, default_database_name, default_language_name from sys.babelfish_authid_login_ext
+where rolname in ('passworduser','aduser@AD','aduserdb@AD','aduserdbenglish@AD','userpassword','duplicate@BABEL','duplicatedefaultdb@BABEL',
+'كلب@BABEL','өглөө@BABEL','ελπίδα@BABEL','爱@BABEL') order by rolname;
+GO
+~~START~~
+name#!#"sys"."varchar"#!#bpchar#!#"sys"."varchar"#!#"sys"."varchar"
+aduser@AD#!#ad\Aduser#!#U#!#master#!#English
+aduserdb@AD#!#ad\Aduserdb#!#U#!#ad_db#!#English
+aduserdbenglish@AD#!#ad\AduserdbEnglish#!#U#!#ad_db#!#English
+duplicate@BABEL#!#babel\duplicate#!#U#!#master#!#English
+duplicatedefaultdb@BABEL#!#babel\duplicatedefaultdb#!#U#!#master#!#English
+passworduser#!#PassWordUser#!#S#!#master#!#English
+userpassword#!#usErpassWord#!#S#!#master#!#English
+ελπίδα@BABEL#!#babel\ελπίδα#!#U#!#master#!#English
+өглөө@BABEL#!#babel\өглөө#!#U#!#master#!#English
+كلب@BABEL#!#babel\كلب#!#U#!#master#!#English
+爱@BABEL#!#babel\爱#!#U#!#master#!#English
+~~END~~
+
+
+-- tsql
+select rolname, orig_loginname, default_database_name, default_language_name from sys.babelfish_authid_login_ext
+where orig_loginname in ('PassWordUser','ad\Aduser','ad\AduserdbEnglish','usErpassWord','babel\duplicate','babel\duplicatedefaultdb') order by rolname;
+GO
+~~START~~
+varchar#!#nvarchar#!#nvarchar#!#nvarchar
+aduser@AD#!#ad\Aduser#!#master#!#English
+aduserdbenglish@AD#!#ad\AduserdbEnglish#!#ad_db#!#English
+duplicate@BABEL#!#babel\duplicate#!#master#!#English
+duplicatedefaultdb@BABEL#!#babel\duplicatedefaultdb#!#master#!#English
+passworduser#!#PassWordUser#!#master#!#English
+userpassword#!#usErpassWord#!#master#!#English
+~~END~~
+
+
+-- tsql
+-- add [ad\Aduser] to sysadmin
+ALTER SERVER ROLE sysadmin ADD MEMBER [ad\Aduser];
+GO
+
+-- tsql
+SELECT COUNT(*) FROM pg_auth_members
+WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'sysadmin')
+AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'aduser@AD');
+GO
+~~START~~
+int
+1
+~~END~~
+
+
+-- tsql
+ALTER SERVER ROLE sysadmin DROP MEMBER [ad\Aduser];
+GO
+
+-- tsql
+SELECT COUNT(*) FROM pg_auth_members
+WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'sysadmin')
+AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'aduser@AD');
+GO
+~~START~~
+int
+0
+~~END~~
+
+
+-- tsql
+select count(*) from sys.server_principals where name = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@BABEL';
+GO
+~~START~~
+int
+0
+~~END~~
+
+select count(*) from sys.server_principals where name = 'passworduser';
+GO
+~~START~~
+int
+1
+~~END~~
+
+select count(*) from sys.server_principals where name = 'AD\aduser';
+GO
+~~START~~
+int
+1
+~~END~~
+
+select count(*) from sys.server_principals where name = 'AD\aduserdb';
+GO
+~~START~~
+int
+1
+~~END~~
+
+select count(*) from sys.server_principals where name = 'AD\aduserdbenglish';
+GO
+~~START~~
+int
+1
+~~END~~
+
+select count(*) from sys.server_principals where name = 'userpassword';
+GO
+~~START~~
+int
+1
+~~END~~
+
+select count(*) from sys.server_principals where name = 'BABEL\duplicate';
+GO
+~~START~~
+int
+1
+~~END~~
+
+select count(*) from sys.server_principals where name = 'BABEL\duplicatedefaultdb';
+GO
+~~START~~
+int
+1
+~~END~~
+
+
+-- psql
+select count(*) from pg_roles where rolname = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@BABEL';
+GO
+~~START~~
+int8
+0
+~~END~~
+
+select count(*) from pg_roles where rolname = 'passworduser';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'aduser@AD';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'aduserdb@AD';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'aduserdbenglish@AD';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'userpassword';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'duplicate@BABEL';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'duplicatedefaultdb@BABEL';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'كلب@BABEL';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'өглөө@BABEL';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = 'ελπίδα@BABEL';
+GO
+~~START~~
+int8
+1
+~~END~~
+
+select count(*) from pg_roles where rolname = '爱@BABEL';
+GO
+~~START~~
+int8
+1
+~~END~~
+
diff --git a/test/JDBC/input/test_windows_login-vu-prepare.mix b/test/JDBC/input/test_windows_login-vu-prepare.mix
index 69b383911f..c2f59c578d 100644
--- a/test/JDBC/input/test_windows_login-vu-prepare.mix
+++ b/test/JDBC/input/test_windows_login-vu-prepare.mix
@@ -1,5 +1,4 @@
--- sla 180000
--- TODO: BABEL-5349
+-- sla 55000
 -- psql
 do 
 $$ begin 
diff --git a/test/JDBC/input/test_windows_login_before-16_6-vu-cleanup.mix b/test/JDBC/input/test_windows_login_before-16_6-vu-cleanup.mix
new file mode 100644
index 0000000000..fc073dc8e4
--- /dev/null
+++ b/test/JDBC/input/test_windows_login_before-16_6-vu-cleanup.mix
@@ -0,0 +1,67 @@
+-- tsql
+DROP LOGIN PassWordUser;
+GO
+
+-- test for drop login with upn format
+DROP LOGIN [aduser@AD];
+GO
+
+DROP LOGIN [ad\adUSer];
+GO
+
+DROP LOGIN [ad\aduserDB];
+GO
+
+DROP LOGIN [ad\Aduserlanguage];
+GO
+
+DROP LOGIN [ad\Aduserdblanguage];
+GO
+
+DROP LOGIN [ad\AduserdbEnglish];
+GO
+
+DROP LOGIN [ad\Aduseroption];
+GO
+
+DROP LOGIN [babel\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]
+GO
+
+DROP LOGIN [ba.bel\username];
+GO
+
+-- test for non-existent login
+DROP LOGIN [babel\non_existent_login]
+GO
+
+-- drop login with different casing
+DROP LOGIN UserPassword;
+GO
+
+DROP LOGIN [BabeL\DupLicate];
+GO
+
+DROP LOGIN [Babel\DuplicateDefaultDB];
+GO
+
+-- test drop logins for logins with different language names
+-- Arabic
+DROP LOGIN [babel\كلب];
+GO
+
+-- Mongolian
+DROP LOGIN [babel\өглөө];
+GO
+
+-- Greek
+DROP LOGIN [babel\ελπίδα];
+GO
+
+-- Chinese
+DROP LOGIN [babel\爱];
+GO
+
+DROP DATABASE ad_db;
+GO
+
+
diff --git a/test/JDBC/input/test_windows_login_before-16_6-vu-prepare.mix b/test/JDBC/input/test_windows_login_before-16_6-vu-prepare.mix
new file mode 100644
index 0000000000..90e9902ed5
--- /dev/null
+++ b/test/JDBC/input/test_windows_login_before-16_6-vu-prepare.mix
@@ -0,0 +1,223 @@
+-- sla 180000
+-- psql
+do 
+$$ begin 
+    if not exists (select * from pg_catalog.pg_roles where rolname = 'rds_ad') 
+        then create role rds_ad NOSUPERUSER NOLOGIN NOCREATEROLE INHERIT NOREPLICATION; 
+    end if; 
+end $$;
+GO
+-- terminate-psql-conn
+
+-- tsql
+CREATE DATABASE ad_db;
+GO
+
+CREATE LOGIN PassWordUser with PASSWORD='123';
+GO
+
+-- positive test case
+CREATE LOGIN [ad\Aduser] from windows;
+GO
+
+-- test for default database
+CREATE LOGIN [ad\Aduserdb] from windows with default_database=[ad_db];
+GO
+
+-- test for default language
+CREATE LOGIN [ad\Aduserlanguage] from windows with default_language=[German];
+GO
+
+-- test for default database and default language
+CREATE LOGIN [ad\Aduserdblanguage] from windows with default_database=[ad_db], default_language=[German];
+GO
+
+CREATE LOGIN [ad\AduserdbEnglish] from windows with default_database=[ad_db], default_language=[English];
+GO
+
+-- test for invalid options for windows
+CREATE LOGIN [ad\Aduseroption] from windows with CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF;
+GO
+
+-- test boundary conditions
+
+-- test for when the login_name is greater than 21 characters
+create login [babel\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa] from windows;
+GO
+
+-- test for when the login_name length is 0
+CREATE LOGIN [babel\] from windows;
+GO
+
+--test for when the total login name, i.e., domain+user is greater than 64
+CREATE LOGIN [babelforapg.individualad.testfornumberofcharactersintotalwhichisnotallowedinpostgres\user] from windows;
+GO
+
+-- test for when the login_name contains invalid characters
+CREATE LOGIN [babeluser] from windows;
+GO
+CREATE LOGIN [babel\user\] from windows;
+GO
+CREATE LOGIN [babel\us\er] from windows;
+GO
+CREATE LOGIN [babel\user/] from windows;
+GO
+CREATE LOGIN [babel\us/er] from windows;
+GO
+CREATE LOGIN [babel\user[] from windows;
+GO
+CREATE LOGIN [babel\u[ser] from windows;
+GO
+CREATE LOGIN [babel\use]r] from windows;
+GO
+CREATE LOGIN [babel\user;] from windows;
+GO
+CREATE LOGIN [babel\us;er] from windows;
+GO
+CREATE LOGIN [babel\user:] from windows;
+GO
+CREATE LOGIN [babel\us:er] from windows;
+GO
+CREATE LOGIN [babel\user|] from windows;
+GO
+CREATE LOGIN [babel\use|r] from windows;
+GO
+CREATE LOGIN [babel\user=] from windows;
+GO
+CREATE LOGIN [babel\u=ser] from windows;
+GO
+CREATE LOGIN [babel\user,] from windows;
+GO
+CREATE LOGIN [babel\us,er] from windows;
+GO
+CREATE LOGIN [babel\user+] from windows;
+GO
+CREATE LOGIN [babel\u+ser] from windows;
+GO
+CREATE LOGIN [babel\user*] from windows;
+GO
+CREATE LOGIN [babel\user*] from windows;
+GO
+CREATE LOGIN [babel\user?] from windows;
+GO
+CREATE LOGIN [babel\us?er] from windows;
+GO
+CREATE LOGIN [babel\user>] from windows;
+GO
+CREATE LOGIN [babel\u>ser] from windows;
+GO
+CREATE LOGIN [babel\user<] from windows;
+GO
+CREATE LOGIN [babel\us<er] from windows;
+GO
+CREATE LOGIN [babel\user@] from windows;
+GO
+CREATE LOGIN [babel\us@er] from windows;
+GO
+CREATE LOGIN [babel\us\er@] from windows;
+GO
+CREATE LOGIN [babel\us<>er] from windows;
+GO
+
+-- test to show UPN format is not allowed
+CREATE LOGIN [user@BABEL] from windows;
+GO
+
+-- test for duplicate login
+CREATE LOGIN usErpassWord with PASSWORD = '123';
+GO
+
+CREATE LOGIN UserPassword with PASSWORD = '098'; 
+GO
+
+CREATE LOGIN [babel\duplicate] from windows;
+GO
+
+CREATE LOGIN [BabeL\DupLicate] from windows;
+GO
+
+CREATE LOGIN [babel\duplicatedefaultdb] from windows with default_database=[master];
+GO
+
+CREATE LOGIN [Babel\DuplicateDefaultDB] from windows with default_database=[ad_db];
+GO
+
+-- test for empty domain name
+CREATE LOGIN [\adnodomain] from windows;
+GO
+
+
+-- test for login names with different language
+-- Arabic
+CREATE LOGIN [babel\كلب] from windows;
+GO
+
+-- Mongolian
+CREATE LOGIN [babel\өглөө] from windows;
+GO
+
+-- Greek
+CREATE LOGIN [babel\ελπίδα] from windows;
+GO
+
+-- Chinese
+CREATE LOGIN [babel\爱] from windows;
+GO
+
+-- test for windows login with password --> should throw error
+CREATE LOGIN [babel\adbabel] from windows with password='1234';
+GO
+
+-- test for when the domain name contains invalid characters
+CREATE LOGIN [<script>!@#$%^&*()\idontexist2] FROM WINDOWS;
+GO
+CREATE LOGIN [ba,bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba~el\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba:bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba!bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba@bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba#bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba$bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba%bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba_bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba^bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba"bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba'bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba(bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba)bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba{bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba}bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba\bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba/bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba<bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba>bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba&bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba*bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba|bel\username] FROM WINDOWS;
+GO
+CREATE LOGIN [ba.bel\username] FROM WINDOWS;
+GO
diff --git a/test/JDBC/input/test_windows_login_before-16_6-vu-verify.mix b/test/JDBC/input/test_windows_login_before-16_6-vu-verify.mix
new file mode 100644
index 0000000000..bc31a4de40
--- /dev/null
+++ b/test/JDBC/input/test_windows_login_before-16_6-vu-verify.mix
@@ -0,0 +1,75 @@
+-- psql
+select rolname, orig_loginname, type, default_database_name, default_language_name from sys.babelfish_authid_login_ext
+where rolname in ('passworduser','aduser@AD','aduserdb@AD','aduserdbenglish@AD','userpassword','duplicate@BABEL','duplicatedefaultdb@BABEL',
+'كلب@BABEL','өглөө@BABEL','ελπίδα@BABEL','爱@BABEL') order by rolname;
+GO
+
+-- tsql
+select rolname, orig_loginname, default_database_name, default_language_name from sys.babelfish_authid_login_ext
+where orig_loginname in ('PassWordUser','ad\Aduser','ad\AduserdbEnglish','usErpassWord','babel\duplicate','babel\duplicatedefaultdb') order by rolname;
+GO
+
+-- tsql
+-- add [ad\Aduser] to sysadmin
+ALTER SERVER ROLE sysadmin ADD MEMBER [ad\Aduser];
+GO
+
+-- tsql
+SELECT COUNT(*) FROM pg_auth_members
+WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'sysadmin')
+AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'aduser@AD');
+GO
+
+-- tsql
+ALTER SERVER ROLE sysadmin DROP MEMBER [ad\Aduser];
+GO
+
+-- tsql
+SELECT COUNT(*) FROM pg_auth_members
+WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'sysadmin')
+AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'aduser@AD');
+GO
+
+-- tsql
+select count(*) from sys.server_principals where name = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@BABEL';
+GO
+select count(*) from sys.server_principals where name = 'passworduser';
+GO
+select count(*) from sys.server_principals where name = 'AD\aduser';
+GO
+select count(*) from sys.server_principals where name = 'AD\aduserdb';
+GO
+select count(*) from sys.server_principals where name = 'AD\aduserdbenglish';
+GO
+select count(*) from sys.server_principals where name = 'userpassword';
+GO
+select count(*) from sys.server_principals where name = 'BABEL\duplicate';
+GO
+select count(*) from sys.server_principals where name = 'BABEL\duplicatedefaultdb';
+GO
+
+-- psql
+select count(*) from pg_roles where rolname = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@BABEL';
+GO
+select count(*) from pg_roles where rolname = 'passworduser';
+GO
+select count(*) from pg_roles where rolname = 'aduser@AD';
+GO
+select count(*) from pg_roles where rolname = 'aduserdb@AD';
+GO
+select count(*) from pg_roles where rolname = 'aduserdbenglish@AD';
+GO
+select count(*) from pg_roles where rolname = 'userpassword';
+GO
+select count(*) from pg_roles where rolname = 'duplicate@BABEL';
+GO
+select count(*) from pg_roles where rolname = 'duplicatedefaultdb@BABEL';
+GO
+select count(*) from pg_roles where rolname = 'كلب@BABEL';
+GO
+select count(*) from pg_roles where rolname = 'өглөө@BABEL';
+GO
+select count(*) from pg_roles where rolname = 'ελπίδα@BABEL';
+GO
+select count(*) from pg_roles where rolname = '爱@BABEL';
+GO
\ No newline at end of file
diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule
index ddb43e7efd..c0260d3a13 100644
--- a/test/JDBC/jdbc_schedule
+++ b/test/JDBC/jdbc_schedule
@@ -489,6 +489,10 @@ ignore#!#declare_atatglobalvars_upgrade-before-16_5-vu-cleanup
 ignore#!#declare_atatglobalvars_upgrade-before-16_5-vu-prepare
 ignore#!#declare_atatglobalvars_upgrade-before-16_5-vu-verify
 
+ignore#!#test_windows_login_before-16_6-vu-prepare
+ignore#!#test_windows_login_before-16_6-vu-verify
+ignore#!#test_windows_login_before-16_6-vu-cleanup
+
 ignore#!#trim-before-15_11-or-16_7-vu-prepare
 ignore#!#trim-before-15_11-or-16_7-vu-verify
 ignore#!#trim-before-15_11-or-16_7-vu-cleanup
diff --git a/test/JDBC/upgrade/16_1/schedule b/test/JDBC/upgrade/16_1/schedule
index c7b658f7a6..f20d1ca9bc 100644
--- a/test/JDBC/upgrade/16_1/schedule
+++ b/test/JDBC/upgrade/16_1/schedule
@@ -458,7 +458,7 @@ TestVarChar
 TestVariableDataLength
 test_windows_alter_login
 test_windows_alter_user
-test_windows_login
+test_windows_login_before-16_6
 test_windows_sp_helpuser
 TestXML
 timefromparts
diff --git a/test/JDBC/upgrade/16_2/schedule b/test/JDBC/upgrade/16_2/schedule
index 7efd7c90d2..4c7b7f0f70 100644
--- a/test/JDBC/upgrade/16_2/schedule
+++ b/test/JDBC/upgrade/16_2/schedule
@@ -462,7 +462,7 @@ TestVarChar
 TestVariableDataLength
 test_windows_alter_login
 test_windows_alter_user
-test_windows_login
+test_windows_login_before-16_6
 test_windows_sp_helpuser
 TestXML
 timefromparts
diff --git a/test/JDBC/upgrade/16_3/schedule b/test/JDBC/upgrade/16_3/schedule
index 4432bc74a0..9ca5d1c4d5 100644
--- a/test/JDBC/upgrade/16_3/schedule
+++ b/test/JDBC/upgrade/16_3/schedule
@@ -463,7 +463,7 @@ TestVarChar
 TestVariableDataLength
 test_windows_alter_login
 test_windows_alter_user
-test_windows_login
+test_windows_login_before-16_6
 test_windows_sp_helpuser
 TestXML
 timefromparts
diff --git a/test/JDBC/upgrade/16_4/schedule b/test/JDBC/upgrade/16_4/schedule
index 28dc723b76..17e5ebc1dd 100644
--- a/test/JDBC/upgrade/16_4/schedule
+++ b/test/JDBC/upgrade/16_4/schedule
@@ -465,7 +465,7 @@ TestVarChar
 TestVariableDataLength
 test_windows_alter_login
 test_windows_alter_user
-test_windows_login
+test_windows_login_before-16_6
 test_windows_sp_helpuser
 TestXML
 timefromparts
diff --git a/test/JDBC/upgrade/16_6/schedule b/test/JDBC/upgrade/16_6/schedule
index 3afb95b83e..8ee7ac98d0 100644
--- a/test/JDBC/upgrade/16_6/schedule
+++ b/test/JDBC/upgrade/16_6/schedule
@@ -466,7 +466,7 @@ TestVarChar
 TestVariableDataLength
 test_windows_alter_login
 test_windows_alter_user
-test_windows_login
+test_windows_login_before-16_6
 test_windows_sp_helpuser
 TestXML
 timefromparts