diff --git a/vmware_nsx_tempest/services/nsxv_client.py b/vmware_nsx_tempest/services/nsxv_client.py
index 1a18eb6..da3ec4f 100644
--- a/vmware_nsx_tempest/services/nsxv_client.py
+++ b/vmware_nsx_tempest/services/nsxv_client.py
@@ -304,7 +304,7 @@ class VSMClient(object):
                         if member['member']['name']]
         return exclude_list
 
-    def get_dhcp_edge_info(self):
+    def get_dhcp_edge_info(self, version=None):
         """Get dhcp edge info.
 
         Return edge if found, else return None.
@@ -316,7 +316,11 @@ class VSMClient(object):
                     and not e['state'] == 'undeployed'):
                 p = re.compile(r'dhcp*')
                 if (p.match(e['name'])):
-                    edge_list.append(e['recentJobInfo']['edgeId'])
+                    if version is not None and \
+                            version[0:5] >= "6.4.0":
+                        edge_list.append(e['id'])
+                    else:
+                        edge_list.append(e['recentJobInfo']['edgeId'])
         count = 0
         result_edge = {}
         for edge_id in edge_list:
diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py
index 1dd7be8..b859eae 100644
--- a/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py
+++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py
@@ -72,9 +72,9 @@ class TestDHCP121BasicOps(dmgr.TopoDeployScenarioManager):
                                CONF.nsxv.manager_uri).group(0)
         cls.vsm = nsxv_client.VSMClient(
             manager_ip, CONF.nsxv.user, CONF.nsxv.password)
-        nsxv_version = cls.vsm.get_vsm_version()
+        cls.nsxv_version = cls.vsm.get_vsm_version()
         # Raise skip testcase exception if nsx-v version is less than 6.2.3
-        if (nsxv_version and nsxv_version < '6.2.3'):
+        if (cls.nsxv_version and cls.nsxv_version < '6.2.3'):
             msg = ('NSX-v version should be greater than or equal to 6.2.3')
             raise cls.skipException(msg)
 
@@ -132,7 +132,8 @@ class TestDHCP121BasicOps(dmgr.TopoDeployScenarioManager):
         self.assertIn('latest', out_data)
         LOG.info("metadata server is acessible")
         # Fetch dhcp edge infor from nsx-v
-        exc_edge = self.vsm.get_dhcp_edge_info()
+        exc_edge = \
+            self.vsm.get_dhcp_edge_info(version=self.nsxv_version)
         self.assertIsNotNone(exc_edge)
         # Fetch host-route and metadata info from nsx-v
         dhcp_options_info = {}
@@ -186,7 +187,7 @@ class TestDHCP121BasicOps(dmgr.TopoDeployScenarioManager):
         self.assertIn(self.nexthop_host_route, out_data)
         LOG.info("Host routes available on vm")
         # Check Host route info at beckend
-        exc_edge = self.vsm.get_dhcp_edge_info()
+        exc_edge = self.vsm.get_dhcp_edge_info(version=self.nsxv_version)
         self.assertIsNotNone(exc_edge)
         # Fetch host-route and metadata info from nsx-v
         dhcp_options_info = {}
@@ -216,7 +217,7 @@ class TestDHCP121BasicOps(dmgr.TopoDeployScenarioManager):
         self.assertNotIn(
             _subnet_data['new_host_routes'][0]['destination'], out_data)
         # Check Host-routes at beckend after deletion
-        exc_edge = self.vsm.get_dhcp_edge_info()
+        exc_edge = self.vsm.get_dhcp_edge_info(version=self.nsxv_version)
         self.assertIsNotNone(exc_edge)
         dhcp_options_info = []
         dhcp_options_info = exc_edge['staticBindings']['staticBindings'][0][