diff --git a/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py b/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py
index d776f479cd3..d46d0362325 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py
+++ b/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py
@@ -235,7 +235,7 @@ def runVlanSpecialTest(self, test):
             self.logStartTest(desc)
             jInput = json.loads(self.readJsonInput(test))
             # check all Vlan from 1 to 4094
-            for i in range(4095):
+            for i in range(1,4095):
                 vlan = 'Vlan'+str(i)
                 jInput["sonic-vlan:sonic-vlan"]["sonic-vlan:VLAN"]["VLAN_LIST"]\
                       [0]["name"] = vlan
diff --git a/src/sonic-yang-models/yang-models/sonic-vlan.yang b/src/sonic-yang-models/yang-models/sonic-vlan.yang
index ad1ab8d743f..1e2361adef4 100644
--- a/src/sonic-yang-models/yang-models/sonic-vlan.yang
+++ b/src/sonic-yang-models/yang-models/sonic-vlan.yang
@@ -36,6 +36,10 @@ module sonic-vlan {
 
 	description "VLAN yang Module for SONiC OS";
 
+	revision 2021-04-28 {
+		description "Modify Vlan name constraint to allow only legal Vlan names";
+	}
+
 	revision 2021-04-22 {
 		description "Modify Vlan Member to include PortChannel along with Port";
 	}
@@ -178,7 +182,7 @@ module sonic-vlan {
 
 				leaf name {
 					type string {
-						pattern 'Vlan([0-9]{1,3}|[1-3][0-9]{3}|[4][0][0-8][0-9]|[4][0][9][0-4])';
+						pattern 'Vlan(409[0-5]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{2}|[1-9][0-9]|[1-9])';
 					}
 				}