diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
index a91f6ab59c8..b8eaf6948b8 100644
--- a/.azure-pipelines/test-docker-sonic-vs-template.yml
+++ b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -50,7 +50,7 @@ jobs:
       docker ps
       ip netns list
       pushd tests
-      sudo py.test -v --force-flaky --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
+      sudo py.test -v --force-flaky --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber) test_virtual_chassis.py
     displayName: "Run vs tests"
 
   - task: PublishTestResults@2
diff --git a/tests/test_virtual_chassis.py b/tests/test_virtual_chassis.py
index 4c44e10ebb8..6d642763bfb 100644
--- a/tests/test_virtual_chassis.py
+++ b/tests/test_virtual_chassis.py
@@ -196,8 +196,9 @@ def test_chassis_system_neigh(self, vct):
 
                     # Check for presence of encap index, retrieve and store it for sync verification
                     test_neigh_entry = asic_db.wait_for_entry("ASIC_STATE:SAI_OBJECT_TYPE_NEIGHBOR_ENTRY", test_neigh)
+                    print(test_neigh_entry)
                     encap_index = test_neigh_entry.get("SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX")
-                    assert encap_index != "", "VOQ encap index is not programmed in ASIC_DB"
+                    assert encap_index != "" and encap_index != None, "VOQ encap index is not programmed in ASIC_DB"
 
                     break