diff --git a/ansible/roles/test/files/ptftests/dhcp_relay_test.py b/ansible/roles/test/files/ptftests/dhcp_relay_test.py
index 86aa17e076..3617a39222 100644
--- a/ansible/roles/test/files/ptftests/dhcp_relay_test.py
+++ b/ansible/roles/test/files/ptftests/dhcp_relay_test.py
@@ -1,6 +1,7 @@
 import ast
 import struct
 import ipaddress
+import os
 
 # Packet Test Framework imports
 import ptf
@@ -107,7 +108,7 @@ def setUp(self):
 
         self.hostname = self.test_params['hostname']
         self.verified_option82 = False
-        
+
         if self.test_params.has_key('other_client_port'):
             self.other_client_port = ast.literal_eval(self.test_params['other_client_port'])
 
@@ -171,7 +172,7 @@ def setUp(self):
             self.option82 += link_selection
 
         # We'll assign our client the IP address 1 greater than our relay interface (i.e., gateway) IP
-        self.client_ip = incrementIpAddress(self.relay_iface_ip, 1) 
+        self.client_ip = incrementIpAddress(self.relay_iface_ip, 1)
         self.client_subnet = self.test_params['relay_iface_netmask']
 
         self.dest_mac_address = self.test_params['dest_mac_address']
@@ -184,7 +185,7 @@ def tearDown(self):
 
     """
      Packet generation functions/wrappers
-    
+
     """
 
     def create_dhcp_discover_packet(self, dst_mac=BROADCAST_MAC, src_port=DHCP_CLIENT_PORT):
@@ -492,8 +493,8 @@ def client_send_discover(self, dst_mac=BROADCAST_MAC, src_port=DHCP_CLIENT_PORT)
         dhcp_discover = self.create_dhcp_discover_packet(dst_mac, src_port)
         testutils.send_packet(self, self.client_port_index, dhcp_discover)
 
-    #Verify the relayed packet has option82 info or not. Sniffing for the relayed packet on leaves and 
-    #once the packet is recieved checking for the destination and looking into options and verifying 
+    #Verify the relayed packet has option82 info or not. Sniffing for the relayed packet on leaves and
+    #once the packet is recieved checking for the destination and looking into options and verifying
     #the option82 info
 
     def pkt_callback(self, pkt):
@@ -762,4 +763,3 @@ def runTest(self):
         if self.test_params.has_key('other_client_port'):
             self.verify_dhcp_relay_pkt_on_other_client_port_with_no_padding(self.dest_mac_address, self.client_udp_src_port)
             self.verify_dhcp_relay_pkt_on_server_port_with_no_padding(self.dest_mac_address, self.client_udp_src_port)
-        
\ No newline at end of file
diff --git a/ansible/roles/test/files/ptftests/dhcpv6_relay_test.py b/ansible/roles/test/files/ptftests/dhcpv6_relay_test.py
index aa9b562e7e..7dcc8bc137 100644
--- a/ansible/roles/test/files/ptftests/dhcpv6_relay_test.py
+++ b/ansible/roles/test/files/ptftests/dhcpv6_relay_test.py
@@ -1,5 +1,7 @@
 import ast
+import os
 import socket
+import struct
 import subprocess
 
 # Packet Test Framework imports
@@ -96,7 +98,7 @@ def __init__(self):
         self.test_params = testutils.test_params_get()
         self.client_port_index = int(self.test_params['client_port_index'])
         self.client_link_local =  self.generate_client_interace_ipv6_link_local_address(self.client_port_index)
-        
+
         DataplaneBaseTest.__init__(self)
 
     def setUp(self):
@@ -375,10 +377,10 @@ def verify_relayed_request_relay_forward(self):
         masked_packet.set_do_not_care_scapy(packet.UDP, "len")
         masked_packet.set_do_not_care_scapy(DHCP6OptClientLinkLayerAddr, "clladdr")
         masked_packet.set_do_not_care_scapy(scapy.layers.dhcp6.DHCP6_RelayForward, "linkaddr")
-        
+
         # verify packets received on the ports connected to our leaves
         testutils.verify_packet_any_port(self, masked_packet, self.server_port_indices)
-                
+
     # Simulate a DHCP server sending a DHCPv6 RELAY-REPLY encapsulating REPLY packet message to client.
     def server_send_reply_relay_reply(self):
         # Form and send DHCPv6 RELAY-REPLY encapsulating REPLY packet
diff --git a/ansible/roles/test/files/ptftests/fib_test.py b/ansible/roles/test/files/ptftests/fib_test.py
index 330c216848..21efca69e3 100644
--- a/ansible/roles/test/files/ptftests/fib_test.py
+++ b/ansible/roles/test/files/ptftests/fib_test.py
@@ -305,14 +305,14 @@ def check_ipv4_route(self, src_port, dst_ip_addr, dst_port_list):
             logging.info('Recieved packet at port {} and packet is {} bytes'.format(rcvd_port,len_rcvd_pkt))
             logging.info('Recieved packet with length of {}'.format(len_rcvd_pkt))
             exp_src_mac = self.router_macs[self.ptf_test_port_map[str(dst_port_list[rcvd_port])]['target_dut']]
-            actual_src_mac = Ether(rcvd_pkt).src
+            actual_src_mac = scapy.Ether(rcvd_pkt).src
             if exp_src_mac != actual_src_mac:
                 raise Exception("Pkt sent from {} to {} on port {} was rcvd pkt on {} which is one of the expected ports, "
                                 "but the src mac doesn't match, expected {}, got {}".
                                 format(ip_src, ip_dst, src_port, dst_port_list[rcvd_port], exp_src_mac, actual_src_mac))
             return (rcvd_port, rcvd_pkt)
         elif self.pkt_action == self.ACTION_DROP:
-            verify_no_packet_any(self, masked_exp_pkt, dst_ports)
+            verify_no_packet_any(self, masked_exp_pkt, dst_port_list)
             return (None, None)
     #---------------------------------------------------------------------
 
@@ -384,14 +384,14 @@ def check_ipv6_route(self, src_port, dst_ip_addr, dst_port_list):
             logging.info('Recieved packet at port {} and packet is {} bytes'.format(rcvd_port,len_rcvd_pkt))
             logging.info('Recieved packet with length of {}'.format(len_rcvd_pkt))
             exp_src_mac = self.router_macs[self.ptf_test_port_map[str(dst_port_list[rcvd_port])]['target_dut']]
-            actual_src_mac = Ether(rcvd_pkt).src
+            actual_src_mac = scapy.Ether(rcvd_pkt).src
             if actual_src_mac != exp_src_mac:
                 raise Exception("Pkt sent from {} to {} on port {} was rcvd pkt on {} which is one of the expected ports, "
                                 "but the src mac doesn't match, expected {}, got {}".
                                 format(ip_src, ip_dst, src_port, dst_port_list[rcvd_port], exp_src_mac, actual_src_mac))
             return (rcvd_port, rcvd_pkt)
         elif self.pkt_action == self.ACTION_DROP:
-            verify_no_packet_any(self, masked_exp_pkt, dst_ports)
+            verify_no_packet_any(self, masked_exp_pkt, dst_port_list)
             return (None, None)
 
     def check_within_expected_range(self, actual, expected):
diff --git a/ansible/roles/test/files/ptftests/populate_fdb.py b/ansible/roles/test/files/ptftests/populate_fdb.py
index a3103ab007..9f10783171 100644
--- a/ansible/roles/test/files/ptftests/populate_fdb.py
+++ b/ansible/roles/test/files/ptftests/populate_fdb.py
@@ -1,6 +1,7 @@
 import ipaddress
 import json
 import logging
+import os
 import ptf
 
 # Packet Test Framework imports
diff --git a/ansible/roles/test/files/ptftests/radv_ipv6_ra_test.py b/ansible/roles/test/files/ptftests/radv_ipv6_ra_test.py
index 245e3b3585..ed93e7d190 100644
--- a/ansible/roles/test/files/ptftests/radv_ipv6_ra_test.py
+++ b/ansible/roles/test/files/ptftests/radv_ipv6_ra_test.py
@@ -1,5 +1,6 @@
 # Packet Test Framework imports
 import logging
+import os
 
 import ptf
 import ptf.testutils as testutils
diff --git a/tests/acl/test_acl.py b/tests/acl/test_acl.py
index d128ad9ca4..68f07f1778 100644
--- a/tests/acl/test_acl.py
+++ b/tests/acl/test_acl.py
@@ -47,8 +47,8 @@
     "ipv6": "acltb_v6_test_rules.j2"
 }
 ACL_RULES_PART_TEMPLATES = {
-    "ipv4": tuple("acltb_test_rules_part_{}.j2".format(i) for i in xrange(1, 3)),
-    "ipv6": tuple("acltb_v6_test_rules_part_{}.j2".format(i) for i in xrange(1, 3))
+    "ipv4": tuple("acltb_test_rules_part_{}.j2".format(i) for i in range(1, 3)),
+    "ipv6": tuple("acltb_v6_test_rules_part_{}.j2".format(i) for i in range(1, 3))
 }
 
 DEFAULT_SRC_IP = {
@@ -129,7 +129,7 @@
 def remove_dataacl_table(duthosts):
     """
     Remove DATAACL to free TCAM resources.
-    The change is written to configdb as we don't want DATAACL recovered after reboot  
+    The change is written to configdb as we don't want DATAACL recovered after reboot
     """
     TABLE_NAME = "DATAACL"
     for duthost in duthosts:
diff --git a/tests/arp/arp_utils.py b/tests/arp/arp_utils.py
index da54611b9e..f90c0aa5d9 100644
--- a/tests/arp/arp_utils.py
+++ b/tests/arp/arp_utils.py
@@ -1,4 +1,5 @@
 import logging
+import re
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.utilities import wait_until
 
diff --git a/tests/bgp/test_bgpmon.py b/tests/bgp/test_bgpmon.py
index 918e7c1a6b..fa9b6a40a8 100644
--- a/tests/bgp/test_bgpmon.py
+++ b/tests/bgp/test_bgpmon.py
@@ -136,7 +136,7 @@ def bgpmon_peer_connected(duthost, bgpmon_peer):
     ptf_interface = "eth" + str(peer_ports[rcvd_port_index])
     res = ptfhost.shell('cat /sys/class/net/{}/address'.format(ptf_interface))
     original_mac = res['stdout']
-    ptfhost.shell("ifconfig %s hw ether %s" % (ptf_interface, Ether(rcvd_pkt).dst))
+    ptfhost.shell("ifconfig %s hw ether %s" % (ptf_interface, scapy.Ether(rcvd_pkt).dst))
     ptfhost.shell("ip add add %s dev %s" % (peer_addr + "/24", ptf_interface))
     ptfhost.exabgp(name=BGP_MONITOR_NAME,
                        state="started",
diff --git a/tests/common/reboot.py b/tests/common/reboot.py
index 460c1ca15c..107c37418b 100644
--- a/tests/common/reboot.py
+++ b/tests/common/reboot.py
@@ -2,6 +2,7 @@
 import time
 import re
 import logging
+import sys
 from multiprocessing.pool import ThreadPool, TimeoutError
 from collections import deque
 
@@ -182,7 +183,7 @@ def execute_reboot_helper():
         raise Exception('DUT {} did not startup'.format(hostname))
 
     logger.info('ssh has started up on {}'.format(hostname))
-    
+
     logger.info('waiting for switch {} to initialize'.format(hostname))
 
     if safe_reboot:
@@ -196,14 +197,14 @@ def execute_reboot_helper():
 
     else:
         time.sleep(wait)
-    
+
     # Wait warmboot-finalizer service
     if reboot_type == REBOOT_TYPE_WARM and wait_warmboot_finalizer:
         logger.info('waiting for warmboot-finalizer service to finish on {}'.format(hostname))
         ret = wait_until(warmboot_finalizer_timeout, 5, 0, check_warmboot_finalizer_inactive, duthost)
         if not ret:
             raise Exception('warmboot-finalizer service timeout on DUT {}'.format(hostname))
-    
+
     DUT_ACTIVE.set()
     logger.info('{} reboot finished on {}'.format(reboot_type, hostname))
     pool.terminate()
diff --git a/tests/console/test_console_loopback.py b/tests/console/test_console_loopback.py
index 5974dcd826..c29c2d69e4 100644
--- a/tests/console/test_console_loopback.py
+++ b/tests/console/test_console_loopback.py
@@ -1,5 +1,6 @@
 import pytest
 import pexpect
+import random
 import string
 
 
diff --git a/tests/container_checker/test_container_checker.py b/tests/container_checker/test_container_checker.py
index 836ddaa572..b7e52ef9b8 100644
--- a/tests/container_checker/test_container_checker.py
+++ b/tests/container_checker/test_container_checker.py
@@ -2,6 +2,7 @@
 Test the feature of container_checker
 """
 import logging
+import time
 
 import pytest
 import time
diff --git a/tests/drop_packets/test_configurable_drop_counters.py b/tests/drop_packets/test_configurable_drop_counters.py
index a9ef244308..58ec122faa 100644
--- a/tests/drop_packets/test_configurable_drop_counters.py
+++ b/tests/drop_packets/test_configurable_drop_counters.py
@@ -504,7 +504,7 @@ def _generate_vlan_servers(vlan_network, vlan_ports):
     # - IP addresses are randomly selected from the given VLAN network
     # - "Hosts" (IP/MAC pairs) are distributed evenly amongst the ports in the VLAN
     addr_list = list(IPNetwork(vlan_network))
-    for counter, i in enumerate(xrange(2, VLAN_HOSTS + 2)):
+    for counter, i in enumerate(range(2, VLAN_HOSTS + 2)):
         mac = VLAN_BASE_MAC_PATTERN.format(counter)
         port = vlan_ports[i % len(vlan_ports)]
         addr = random.choice(addr_list)
diff --git a/tests/ecmp/test_fgnhg.py b/tests/ecmp/test_fgnhg.py
index 9b12c89816..5205549333 100644
--- a/tests/ecmp/test_fgnhg.py
+++ b/tests/ecmp/test_fgnhg.py
@@ -4,6 +4,7 @@
 import logging
 import ipaddress
 import json
+from collections import defaultdict
 from tests.ptf_runner import ptf_runner
 from tests.common import config_reload
 from tests.common.helpers.assertions import pytest_assert
@@ -298,7 +299,7 @@ def fg_ecmp(ptfhost, duthost, router_mac, net_ports, port_list, ip_to_port, bank
     flows_per_nh = NUM_FLOWS/len(port_list)
     for port in port_list:
         exp_flow_count[port] = flows_per_nh
-        
+
     flows_to_redist = exp_flow_count[shutdown_link]
     for port in bank_0_port:
         if port != shutdown_link:
@@ -402,7 +403,7 @@ def fg_ecmp(ptfhost, duthost, router_mac, net_ports, port_list, ip_to_port, bank
         if port != withdraw_nh_port:
             exp_flow_count[port] = flows_for_withdrawn_nh_bank
 
-    partial_ptf_runner(ptfhost, 'add_nh', dst_ip, exp_flow_count, add_nh_port=shutdown_link) 
+    partial_ptf_runner(ptfhost, 'add_nh', dst_ip, exp_flow_count, add_nh_port=shutdown_link)
 
 
     ### Send the same flows again, but enable the next-hop which was down previously
@@ -422,7 +423,7 @@ def fg_ecmp(ptfhost, duthost, router_mac, net_ports, port_list, ip_to_port, bank
     for port in port_list:
         exp_flow_count[port] = flows_per_nh
 
-    partial_ptf_runner(ptfhost, 'add_nh', dst_ip, exp_flow_count, add_nh_port=withdraw_nh_port) 
+    partial_ptf_runner(ptfhost, 'add_nh', dst_ip, exp_flow_count, add_nh_port=withdraw_nh_port)
 
 
     ### Simulate route and link flap conditions by toggling the route
@@ -467,10 +468,10 @@ def fg_ecmp(ptfhost, duthost, router_mac, net_ports, port_list, ip_to_port, bank
     for port in bank_1_port:
         exp_flow_count[port] = flows_per_nh
 
-    partial_ptf_runner(ptfhost, 'withdraw_bank', dst_ip, exp_flow_count, withdraw_nh_bank=withdraw_nh_bank) 
+    partial_ptf_runner(ptfhost, 'withdraw_bank', dst_ip, exp_flow_count, withdraw_nh_bank=withdraw_nh_bank)
 
 
-    ### Send the same flows again, but enable 1 next-hop in a previously down bank to check 
+    ### Send the same flows again, but enable 1 next-hop in a previously down bank to check
     ### if flows redistribute back to previously down bank
     logger.info("Send the same flows again, but enable 1 next-hop in a previously down bank to check "
                 "if flows redistribute back to previously down bank")
@@ -597,7 +598,7 @@ def common_setup_teardown(tbinfo, duthosts, rand_one_dut_hostname, ptfhost):
         if USE_INNER_HASHING is True:
             configure_switch_vxlan_cfg(duthost)
 
-        yield duthost, cfg_facts, router_mac, net_ports 
+        yield duthost, cfg_facts, router_mac, net_ports
 
     finally:
         cleanup(duthost, ptfhost)
diff --git a/tests/everflow/test_everflow_ipv6.py b/tests/everflow/test_everflow_ipv6.py
index a00b867910..b70fc03ef5 100644
--- a/tests/everflow/test_everflow_ipv6.py
+++ b/tests/everflow/test_everflow_ipv6.py
@@ -1,4 +1,5 @@
 """Test cases to support the Everflow IPv6 Mirroring feature in SONiC."""
+import time
 import pytest
 import ptf.testutils as testutils
 
diff --git a/tests/everflow/test_everflow_per_interface.py b/tests/everflow/test_everflow_per_interface.py
index d83b5e2dba..7ae3f0f3f4 100644
--- a/tests/everflow/test_everflow_per_interface.py
+++ b/tests/everflow/test_everflow_per_interface.py
@@ -2,6 +2,7 @@
 import logging
 import time
 import pytest
+import os
 
 import ptf.testutils as testutils
 import everflow_test_utilities as everflow_utils
diff --git a/tests/fdb/test_fdb.py b/tests/fdb/test_fdb.py
index ecae7af1cf..97ca065c0a 100644
--- a/tests/fdb/test_fdb.py
+++ b/tests/fdb/test_fdb.py
@@ -10,6 +10,7 @@
 import pprint
 import re
 import random
+from collections import defaultdict
 
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.fixtures.ptfhost_utils import change_mac_addresses      # lgtm[py/unused-import]
diff --git a/tests/fdb/test_fdb_mac_move.py b/tests/fdb/test_fdb_mac_move.py
index c2761c2474..30ca446ae4 100644
--- a/tests/fdb/test_fdb_mac_move.py
+++ b/tests/fdb/test_fdb_mac_move.py
@@ -2,6 +2,7 @@
 import logging
 import time
 import math
+from collections import defaultdict
 
 from tests.common.utilities import wait_until
 from tests.common.helpers.assertions import pytest_assert
diff --git a/tests/memory_checker/test_memory_checker.py b/tests/memory_checker/test_memory_checker.py
index 934f336469..0b306f5528 100644
--- a/tests/memory_checker/test_memory_checker.py
+++ b/tests/memory_checker/test_memory_checker.py
@@ -9,6 +9,7 @@
    help of new Monit syntax although Monit failed to reset its internal counter.
 """
 import logging
+import time
 from multiprocessing.pool import ThreadPool
 
 import pytest
diff --git a/tests/nat/nat_helpers.py b/tests/nat/nat_helpers.py
index cd3ea0f2f7..891225afc1 100644
--- a/tests/nat/nat_helpers.py
+++ b/tests/nat/nat_helpers.py
@@ -1,3 +1,4 @@
+import copy
 import re
 import os
 import time
@@ -1111,7 +1112,7 @@ def get_redis_val(duthost, db, key):
         try:
             output = exec_command(duthost, ["redis-dump -d {} --pretty -k *{}*".format(db, key)])
             if output["rc"]:
-                raise Exception('Return code is {} not 0'.format(output_cli["rc"]))
+                raise Exception('Return code is {} not 0'.format(output["rc"]))
             redis_dict = json.loads(output['stdout'])
             for table in redis_dict:
                 if 'expireat' in redis_dict[table]:
diff --git a/tests/nat/test_static_nat.py b/tests/nat/test_static_nat.py
index 49c344f4f6..4b80b9b91b 100644
--- a/tests/nat/test_static_nat.py
+++ b/tests/nat/test_static_nat.py
@@ -1,6 +1,7 @@
 import copy
 import time
 import json
+import re
 
 import pytest
 
diff --git a/tests/pfcwd/test_pfcwd_all_port_storm.py b/tests/pfcwd/test_pfcwd_all_port_storm.py
index 794e191b61..59278b6958 100644
--- a/tests/pfcwd/test_pfcwd_all_port_storm.py
+++ b/tests/pfcwd/test_pfcwd_all_port_storm.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import time
 import pytest
 
 from tests.common.fixtures.conn_graph_facts import fanout_graph_facts
diff --git a/tests/pfcwd/test_pfcwd_timer_accuracy.py b/tests/pfcwd/test_pfcwd_timer_accuracy.py
index e431fac601..5fd13dc3bf 100644
--- a/tests/pfcwd/test_pfcwd_timer_accuracy.py
+++ b/tests/pfcwd/test_pfcwd_timer_accuracy.py
@@ -227,7 +227,7 @@ def test_pfcwd_timer_accuracy(self, duthosts, rand_one_dut_hostname, pfcwd_timer
         self.all_detect_time = list()
         self.all_restore_time = list()
         try:
-            for i in xrange(1, 20):
+            for i in range(1, 20):
                 logger.info("--- Pfcwd Timer Test iteration #{}".format(i))
                 self.run_test()
             self.verify_pfcwd_timers()
diff --git a/tests/platform_tests/thermal_control_test_helper.py b/tests/platform_tests/thermal_control_test_helper.py
index cb813902ae..2e3556d6f1 100644
--- a/tests/platform_tests/thermal_control_test_helper.py
+++ b/tests/platform_tests/thermal_control_test_helper.py
@@ -305,7 +305,7 @@ def start_thermal_control_daemon(dut):
         dut.start_pmon_daemon(daemon_name)
         wait_until(10, 2, 0, check_expected_daemon_status, dut, expected_running_status)
     running_daemon_status, _ = dut.get_pmon_daemon_status(daemon_name)
-    assert running_daemon_status == expected_running_status, "Run command '{}' failed after starting of thermalctld on {}".format(start_pmon_daemon, dut.hostname)
+    assert running_daemon_status == expected_running_status, "Run command '{}' failed after starting of thermalctld on {}".format("start_pmon_daemon", dut.hostname)
     logging.info("thermalctld processes started successfully on {}".format(dut.hostname))
 
 def stop_thermal_control_daemon(dut):
@@ -314,9 +314,9 @@ def stop_thermal_control_daemon(dut):
         dut.stop_pmon_daemon(daemon_name)
         wait_until(10, 2, 0, check_expected_daemon_status, dut, expected_stopped_status)
     stopped_daemon_status, _ = dut.get_pmon_daemon_status(daemon_name)
-    assert stopped_daemon_status == expected_stopped_status, "Run command '{}' failed after stopping of thermalctld on {}".format(stop_pmon_daemon, dut.hostname)
+    assert stopped_daemon_status == expected_stopped_status, "Run command '{}' failed after stopping of thermalctld on {}".format("stop_pmon_daemon", dut.hostname)
     logging.info("thermalctld processes stopped successfully on {}".format(dut.hostname))
-                                                                
+
 class ThermalPolicyFileContext:
     """
     Context class to help replace thermal control policy file and restore it automatically.
diff --git a/tests/platform_tests/verify_dut_health.py b/tests/platform_tests/verify_dut_health.py
index ae9c5dc11c..adba13567a 100644
--- a/tests/platform_tests/verify_dut_health.py
+++ b/tests/platform_tests/verify_dut_health.py
@@ -2,6 +2,7 @@
 import pytest
 import logging
 import time
+import traceback
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.platform.transceiver_utils import parse_transceiver_info
 from tests.common.reboot import reboot, REBOOT_TYPE_COLD
diff --git a/tests/qos/qos_sai_base.py b/tests/qos/qos_sai_base.py
index 3584d7701c..f0d00d11fc 100644
--- a/tests/qos/qos_sai_base.py
+++ b/tests/qos/qos_sai_base.py
@@ -1,8 +1,11 @@
 import ipaddress
 import json
 import logging
+import os
 import pytest
+import random
 import re
+import sys
 import yaml
 
 from tests.common.fixtures.ptfhost_utils import ptf_portmap_file    # lgtm[py/unused-import]
diff --git a/tests/qos/test_buffer_traditional.py b/tests/qos/test_buffer_traditional.py
index 6053626846..c01ca4cdd5 100644
--- a/tests/qos/test_buffer_traditional.py
+++ b/tests/qos/test_buffer_traditional.py
@@ -1,4 +1,5 @@
 import logging
+import os
 
 import pytest
 
diff --git a/tests/qos/test_qos_masic.py b/tests/qos/test_qos_masic.py
index ab102a8c28..6a4ad61bdd 100644
--- a/tests/qos/test_qos_masic.py
+++ b/tests/qos/test_qos_masic.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import pytest
+import time
 
 from tests.common.utilities import wait_until
 
diff --git a/tests/qos/tunnel_qos_remap_base.py b/tests/qos/tunnel_qos_remap_base.py
index d17adeb944..6a0f0c9a47 100644
--- a/tests/qos/tunnel_qos_remap_base.py
+++ b/tests/qos/tunnel_qos_remap_base.py
@@ -35,7 +35,7 @@ def build_testing_packet(src_ip, dst_ip, active_tor_mac, standby_tor_mac, active
                 ip_dst=active_tor_ip,
                 ip_dscp=outer_dscp,
                 ip_ecn=ecn,
-                inner_frame=pkt[IP]
+                inner_frame=pkt[scapy.IP]
             )
     pkt.ttl += 1
     exp_tunnel_pkt = Mask(ipinip_packet)
@@ -64,7 +64,7 @@ def get_queue_counter(duthost, port, queue, clear_before_read=False):
         Ethernet4    UC0               0                0            0             0
     """
     txq = "UC{}".format(queue)
-    for line in output:    
+    for line in output:
         fields = line.split()
         if fields[1] == txq:
             return int(fields[2])
@@ -79,7 +79,7 @@ def check_queue_counter(duthost, intfs, queue, counter):
         if len(fields) == 6 and fields[0] in intfs and fields[1] == 'UC{}'.format(queue):
             if int(fields[2]) >= counter:
                 return True
-    
+
     return False
 
 
@@ -97,7 +97,7 @@ def counter_poll_config(duthost, type, interval_ms):
 def load_tunnel_qos_map():
     """
     Read DSCP_TO_TC_MAP/TC_TO_PRIORITY_GROUP_MAP/TC_TO_DSCP_MAP/TC_TO_QUEUE_MAP from file
-    return a dict 
+    return a dict
     """
     TUNNEL_QOS_MAP_FILENAME = r"qos/files/tunnel_qos_map.json"
     TUNNEL_MAP_NAME = "AZURE_TUNNEL"
@@ -146,7 +146,7 @@ def dut_config(rand_selected_dut, rand_unselected_dut, tbinfo, ptf_portmap_file_
     server_ip = muxcable_info[server_port_name]['server_ipv4'].split('/')[0]
     server_port_ptf_id = mg_facts['minigraph_ptf_indices'][server_port_name]
     server_port_slice = mg_facts['minigraph_port_indices'][server_port_name]
-    
+
     selected_tor_mgmt = mg_facts['minigraph_mgmt_interface']['addr']
     selected_tor_mac = rand_selected_dut.facts['router_mac']
     selected_tor_loopback = get_iface_ip(mg_facts, 'Loopback0')
@@ -194,7 +194,7 @@ def qos_config(rand_selected_dut, tbinfo, dut_config):
     qos_configs = {}
     with open(r"qos/files/qos.yml") as file:
         qos_configs = yaml.load(file, Loader=yaml.FullLoader)
-    
+
     mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
     vendor = duthost.facts["asic_type"]
     hostvars = duthost.host.options['variable_manager']._hostvars[duthost.hostname]
@@ -214,7 +214,7 @@ def qos_config(rand_selected_dut, tbinfo, dut_config):
     else:
         # Default topo is any
         dut_topo = dut_topo + "any"
-    
+
     # Get profile name for src port
     lag_port_name = dut_config["lag_port_name"]
     profile_name = _lossless_profile_name(duthost, lag_port_name, '2-4')
@@ -255,7 +255,7 @@ def swap_syncd(request, rand_selected_dut, creds):
 
 def _update_docker_service(duthost, docker="", action="", service=""):
     """
-    A helper function to start/stop service      
+    A helper function to start/stop service
     """
     cmd = "docker exec {docker} supervisorctl {action} {service}".format(docker=docker, action=action, service=service)
     duthost.shell(cmd)
@@ -275,10 +275,10 @@ def update_docker_services(rand_selected_dut, swap_syncd, disable_container_auto
             {"docker": "lldp", "service": "lldpd"},
             {"docker": "bgp",  "service": "bgpd"},
             {"docker": "bgp",  "service": "bgpmon"}
-            ] 
+            ]
     for service in SERVICES:
         _update_docker_service(rand_selected_dut, action="stop", **service)
-    
+
     yield
 
     enable_container_autorestart(rand_selected_dut, testcase="test_tunnel_qos_remap", feature_list=feature_list)
@@ -312,7 +312,7 @@ def setup_module(rand_selected_dut, rand_unselected_dut, update_docker_services)
     # Disable the counter for watermark so that the cached counter in SAI is not cleared periodically
     _update_counterpoll_state(rand_selected_dut, 'watermark', 'disable')
     _update_counterpoll_state(rand_unselected_dut, 'watermark', 'disable')
-    
+
     yield
 
     # Set the muxcable mode to auto
@@ -341,7 +341,7 @@ def toggle_mux_to_host(duthost):
         else:
             logger.info("Mux cable toggled to {}".format(duthost.hostname))
             break
-    
+
     pytest_assert(TIMEOUT > 0, "Failed to toggle muxcable to {}".format(duthost.hostname))
 
 
diff --git a/tests/route/test_route_perf.py b/tests/route/test_route_perf.py
index 5d6611c0fe..f3f6b95994 100644
--- a/tests/route/test_route_perf.py
+++ b/tests/route/test_route_perf.py
@@ -1,6 +1,7 @@
 import pytest
 import json
 import logging
+import re
 import time
 from datetime import datetime
 from tests.common.utilities import wait_until
@@ -223,13 +224,13 @@ def test_perf_add_remove_routes(duthosts, enum_rand_one_per_hwsku_frontend_hostn
     # Generate interfaces and neighbors
     NUM_NEIGHS = 50 # Update max num neighbors for multi-asic
     intf_neighs, str_intf_nexthop = generate_intf_neigh(asichost, NUM_NEIGHS, ip_versions)
-   
+
     route_tag = "ipv{}_route".format(ip_versions)
     used_routes_count = asichost.count_crm_resources("main_resources", route_tag, "used")
     avail_routes_count = asichost.count_crm_resources("main_resources", route_tag, "available")
     pytest_assert(avail_routes_count, "CRM main_resources data is not ready within adjusted CRM polling time {}s".\
             format(CRM_POLL_INTERVAL))
-    
+
     num_routes = min(avail_routes_count, set_num_routes)
     logger.info("IP route utilization before test start: Used: {}, Available: {}, Test count: {}"\
         .format(used_routes_count, avail_routes_count, num_routes))
diff --git a/tests/show_techsupport/test_techsupport.py b/tests/show_techsupport/test_techsupport.py
index 08d9927edf..a99e242b4f 100644
--- a/tests/show_techsupport/test_techsupport.py
+++ b/tests/show_techsupport/test_techsupport.py
@@ -1,10 +1,12 @@
 import os
 import pprint
 import pytest
+import re
 import time
 import logging
 import tech_support_cmds as cmds
 
+from collections import defaultdict
 from random import randint
 from tests.common.helpers.assertions import pytest_assert, pytest_require
 from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer, LogAnalyzerError
diff --git a/tests/stress/conftest.py b/tests/stress/conftest.py
index 57fc26e3bd..a9b060be22 100644
--- a/tests/stress/conftest.py
+++ b/tests/stress/conftest.py
@@ -1,5 +1,6 @@
 import logging
 import pytest
+import time
 
 from tests.common.utilities import wait_until
 from utils import get_crm_resources, check_queue_status, sleep_to_wait
diff --git a/tests/stress/utils.py b/tests/stress/utils.py
index cff557c7a3..d8c6d77640 100644
--- a/tests/stress/utils.py
+++ b/tests/stress/utils.py
@@ -1,4 +1,5 @@
 import re
+import time
 
 TOPO_FILENAME_TEMPLATE = 'topo_{}.yml'
 SHOW_BGP_SUMMARY_CMD = "show ip bgp summary"
diff --git a/tests/vrf/test_vrf.py b/tests/vrf/test_vrf.py
index 7ef8f10580..650020f732 100644
--- a/tests/vrf/test_vrf.py
+++ b/tests/vrf/test_vrf.py
@@ -1136,7 +1136,7 @@ def vrf_count(self, request):
     def random_vrf_list(self, vrf_count, request):
         test_count = request.config.option.vrf_test_count or self.TEST_COUNT  # get cmd line option value, use default if none
 
-        return sorted(random.sample(xrange(1, vrf_count+1), min(test_count, vrf_count)))
+        return sorted(random.sample(range(1, vrf_count+1), min(test_count, vrf_count)))
 
     @pytest.fixture(scope="class", autouse=True)
     def setup_vrf_capacity(self, duthosts, rand_one_dut_hostname, ptfhost, localhost, cfg_facts, vrf_count, random_vrf_list, request):