diff --git a/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py b/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py
index 216ce4a1d90..6a02dd6a933 100644
--- a/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py
+++ b/ansible/roles/test/files/ptftests/py3/dhcp_relay_test.py
@@ -319,7 +319,7 @@ def create_dhcp_offer_packet(self):
         return self.dhcp_offer_packet(eth_server=self.server_iface_mac,
                     eth_dst=self.uplink_mac,
                     eth_client=self.client_mac,
-                    ip_server=self.server_ip,
+                    ip_server=self.server_ip[0],
                     ip_dst=self.relay_iface_ip if not self.dual_tor else self.switch_loopback_ip,
                     ip_offered=self.client_ip,
                     port_dst=self.DHCP_SERVER_PORT,
@@ -352,11 +352,11 @@ def create_dhcp_offer_relayed_packet(self):
                     flags=0x8000,
                     ciaddr=self.DEFAULT_ROUTE_IP,
                     yiaddr=self.client_ip,
-                    siaddr=self.server_ip,
+                    siaddr=self.server_ip[0],
                     giaddr=self.relay_iface_ip if not self.dual_tor else self.switch_loopback_ip,
                     chaddr=my_chaddr)
         bootp /= scapy.DHCP(options=[('message-type', 'offer'),
-                    ('server_id', self.server_ip),
+                    ('server_id', self.server_ip[0]),
                     ('lease_time', self.LEASE_TIME),
                     ('subnet_mask', self.client_subnet),
                     ("vendor_class_id", "http://0.0.0.0/this_is_a_very_very_long_path/test.bin".encode('utf-8')),
@@ -373,7 +373,7 @@ def create_dhcp_offer_relayed_packet(self):
     def create_dhcp_request_packet(self, dst_mac=BROADCAST_MAC, src_port=DHCP_CLIENT_PORT):
         request_packet = testutils.dhcp_request_packet(
             eth_client=self.client_mac,
-            ip_server=self.server_ip,
+            ip_server=self.server_ip[0],
             ip_requested=self.client_ip,
             set_broadcast_bit=True
         )
@@ -416,7 +416,7 @@ def create_dhcp_request_relayed_packet(self):
                     chaddr=my_chaddr)
         bootp /= scapy.DHCP(options=[('message-type', 'request'),
                     ('requested_addr', self.client_ip),
-                    ('server_id', self.server_ip),
+                    ('server_id', self.server_ip[0]),
                     (82, self.option82),
                     ('end')])
 
@@ -432,7 +432,7 @@ def create_dhcp_ack_packet(self):
         return testutils.dhcp_ack_packet(eth_server=self.server_iface_mac,
                     eth_dst=self.uplink_mac,
                     eth_client=self.client_mac,
-                    ip_server=self.server_ip,
+                    ip_server=self.server_ip[0],
                     ip_dst=self.relay_iface_ip if not self.dual_tor else self.switch_loopback_ip,
                     ip_offered=self.client_ip,
                     port_dst=self.DHCP_SERVER_PORT,
@@ -465,11 +465,11 @@ def create_dhcp_ack_relayed_packet(self):
                     flags=0x8000,
                     ciaddr=self.DEFAULT_ROUTE_IP,
                     yiaddr=self.client_ip,
-                    siaddr=self.server_ip,
+                    siaddr=self.server_ip[0],
                     giaddr=self.relay_iface_ip if not self.dual_tor else self.switch_loopback_ip,
                     chaddr=my_chaddr)
         bootp /= scapy.DHCP(options=[('message-type', 'ack'),
-                    ('server_id', self.server_ip),
+                    ('server_id', self.server_ip[0]),
                     ('lease_time', self.LEASE_TIME),
                     ('subnet_mask', self.client_subnet),
                     ('end')])
@@ -502,7 +502,7 @@ def client_send_discover(self, dst_mac=BROADCAST_MAC, src_port=DHCP_CLIENT_PORT)
 
     def pkt_callback(self, pkt):
         if pkt.haslayer(scapy2.IP) and pkt.haslayer(scapy2.DHCP):
-            if pkt.getlayer(scapy2.IP).dst in [self.server_ip] and pkt.getlayer(scapy2.DHCP) is not None:
+            if pkt.getlayer(scapy2.IP).dst in self.server_ip and pkt.getlayer(scapy2.DHCP) is not None:
                 self.verified_option82 = False
                 pkt_options = ''
                 for option in pkt.getlayer(scapy2.DHCP).options:
diff --git a/tests/dhcp_relay/test_dhcp_relay.py b/tests/dhcp_relay/test_dhcp_relay.py
index 0a2d57c2a36..31a66a81626 100644
--- a/tests/dhcp_relay/test_dhcp_relay.py
+++ b/tests/dhcp_relay/test_dhcp_relay.py
@@ -278,7 +278,7 @@ def test_dhcp_relay_default(ptfhost, dut_dhcp_relay_data, validate_dut_routes_ex
                            "client_iface_alias": str(dhcp_relay['client_iface']['alias']),
                            "leaf_port_indices": repr(dhcp_relay['uplink_port_indices']),
                            "num_dhcp_servers": len(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs']),
-                           "server_ip": str(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'][0]),
+                           "server_ip": dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'],
                            "relay_iface_ip": str(dhcp_relay['downlink_vlan_iface']['addr']),
                            "relay_iface_mac": str(dhcp_relay['downlink_vlan_iface']['mac']),
                            "relay_iface_netmask": str(dhcp_relay['downlink_vlan_iface']['mask']),
@@ -330,7 +330,7 @@ def test_dhcp_relay_after_link_flap(ptfhost, dut_dhcp_relay_data, validate_dut_r
                            "client_iface_alias": str(dhcp_relay['client_iface']['alias']),
                            "leaf_port_indices": repr(dhcp_relay['uplink_port_indices']),
                            "num_dhcp_servers": len(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs']),
-                           "server_ip": str(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'][0]),
+                           "server_ip": dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'],
                            "relay_iface_ip": str(dhcp_relay['downlink_vlan_iface']['addr']),
                            "relay_iface_mac": str(dhcp_relay['downlink_vlan_iface']['mac']),
                            "relay_iface_netmask": str(dhcp_relay['downlink_vlan_iface']['mask']),
@@ -393,7 +393,7 @@ def test_dhcp_relay_start_with_uplinks_down(ptfhost, dut_dhcp_relay_data, valida
                            "client_iface_alias": str(dhcp_relay['client_iface']['alias']),
                            "leaf_port_indices": repr(dhcp_relay['uplink_port_indices']),
                            "num_dhcp_servers": len(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs']),
-                           "server_ip": str(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'][0]),
+                           "server_ip": dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'],
                            "relay_iface_ip": str(dhcp_relay['downlink_vlan_iface']['addr']),
                            "relay_iface_mac": str(dhcp_relay['downlink_vlan_iface']['mac']),
                            "relay_iface_netmask": str(dhcp_relay['downlink_vlan_iface']['mask']),
@@ -429,7 +429,7 @@ def test_dhcp_relay_unicast_mac(ptfhost, dut_dhcp_relay_data, validate_dut_route
                            "client_iface_alias": str(dhcp_relay['client_iface']['alias']),
                            "leaf_port_indices": repr(dhcp_relay['uplink_port_indices']),
                            "num_dhcp_servers": len(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs']),
-                           "server_ip": str(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'][0]),
+                           "server_ip": dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'],
                            "relay_iface_ip": str(dhcp_relay['downlink_vlan_iface']['addr']),
                            "relay_iface_mac": str(dhcp_relay['downlink_vlan_iface']['mac']),
                            "relay_iface_netmask": str(dhcp_relay['downlink_vlan_iface']['mask']),
@@ -464,7 +464,7 @@ def test_dhcp_relay_random_sport(ptfhost, dut_dhcp_relay_data, validate_dut_rout
                            "client_iface_alias": str(dhcp_relay['client_iface']['alias']),
                            "leaf_port_indices": repr(dhcp_relay['uplink_port_indices']),
                            "num_dhcp_servers": len(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs']),
-                           "server_ip": str(dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'][0]),
+                           "server_ip": dhcp_relay['downlink_vlan_iface']['dhcp_server_addrs'],
                            "relay_iface_ip": str(dhcp_relay['downlink_vlan_iface']['addr']),
                            "relay_iface_mac": str(dhcp_relay['downlink_vlan_iface']['mac']),
                            "relay_iface_netmask": str(dhcp_relay['downlink_vlan_iface']['mask']),