diff --git a/extras/vpp_config/scripts/dpdk-devbind.py b/extras/vpp_config/scripts/dpdk-devbind.py
index b65677dab0c..80edb3b9eea 100755
--- a/extras/vpp_config/scripts/dpdk-devbind.py
+++ b/extras/vpp_config/scripts/dpdk-devbind.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 #   BSD LICENSE
 #
diff --git a/extras/vpp_config/vpp_config.py b/extras/vpp_config/vpp_config.py
index 0ff40f161b5..e863cde854e 100755
--- a/extras/vpp_config/vpp_config.py
+++ b/extras/vpp_config/vpp_config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (c) 2016 Cisco and/or its affiliates.
 # Copyright (c) 2018 Vinci Consulting Corp.  All rights reserved.
diff --git a/src/plugins/abf/test/test_abf.py b/src/plugins/abf/test/test_abf.py
index 221a793fed3..d3500fad2bc 100644
--- a/src/plugins/abf/test/test_abf.py
+++ b/src/plugins/abf/test/test_abf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from socket import inet_pton, inet_ntop, AF_INET, AF_INET6
 import unittest
diff --git a/src/plugins/acl/test/test_acl_plugin.py b/src/plugins/acl/test/test_acl_plugin.py
index a85414e440a..f07d37548fe 100644
--- a/src/plugins/acl/test/test_acl_plugin.py
+++ b/src/plugins/acl/test/test_acl_plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ACL plugin Test Case HLD:
 """
 
diff --git a/src/plugins/acl/test/test_acl_plugin_conns.py b/src/plugins/acl/test/test_acl_plugin_conns.py
index 58c44e68262..ac9e7c11f2f 100644
--- a/src/plugins/acl/test/test_acl_plugin_conns.py
+++ b/src/plugins/acl/test/test_acl_plugin_conns.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ ACL plugin extended stateful tests """
 
 import unittest
diff --git a/src/plugins/acl/test/test_acl_plugin_l2l3.py b/src/plugins/acl/test/test_acl_plugin_l2l3.py
index 31b4058fc69..6aaf4203770 100644
--- a/src/plugins/acl/test/test_acl_plugin_l2l3.py
+++ b/src/plugins/acl/test/test_acl_plugin_l2l3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ACL IRB Test Case HLD:
 
 **config**
diff --git a/src/plugins/acl/test/test_acl_plugin_macip.py b/src/plugins/acl/test/test_acl_plugin_macip.py
index 31bc8e5478c..e1393696875 100644
--- a/src/plugins/acl/test/test_acl_plugin_macip.py
+++ b/src/plugins/acl/test/test_acl_plugin_macip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 """ACL plugin - MACIP tests
 """
diff --git a/src/plugins/acl/test/test_classify_l2_acl.py b/src/plugins/acl/test/test_classify_l2_acl.py
index 1525f7225f0..c9962d638bd 100644
--- a/src/plugins/acl/test/test_classify_l2_acl.py
+++ b/src/plugins/acl/test/test_classify_l2_acl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Classifier-based L2 ACL Test Case HLD:
 """
 
diff --git a/src/plugins/cdp/test/test_cdp.py b/src/plugins/cdp/test/test_cdp.py
index 27f35c2937d..1bc67c45c3e 100644
--- a/src/plugins/cdp/test/test_cdp.py
+++ b/src/plugins/cdp/test/test_cdp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ CDP tests """
 
 from scapy.packet import Packet
diff --git a/src/plugins/dhcp/test/test_dhcp.py b/src/plugins/dhcp/test/test_dhcp.py
index e79787c5f23..6435d7fd6f7 100644
--- a/src/plugins/dhcp/test/test_dhcp.py
+++ b/src/plugins/dhcp/test/test_dhcp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
diff --git a/src/plugins/dns/test/test_dns.py b/src/plugins/dns/test/test_dns.py
index 0f878831b07..55923e26057 100644
--- a/src/plugins/dns/test/test_dns.py
+++ b/src/plugins/dns/test/test_dns.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/src/plugins/flowprobe/test/test_flowprobe.py b/src/plugins/flowprobe/test/test_flowprobe.py
index 8c9c54b78b5..445ec6d9cae 100644
--- a/src/plugins/flowprobe/test/test_flowprobe.py
+++ b/src/plugins/flowprobe/test/test_flowprobe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import binascii
 import random
diff --git a/src/plugins/gbp/test/test_gbp.py b/src/plugins/gbp/test/test_gbp.py
index c7cdab891cb..a06492904e1 100644
--- a/src/plugins/gbp/test/test_gbp.py
+++ b/src/plugins/gbp/test/test_gbp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from socket import AF_INET, AF_INET6
 import unittest
diff --git a/src/plugins/gtpu/test/test_gtpu.py b/src/plugins/gtpu/test/test_gtpu.py
index 957181a71e4..b6a7012966a 100644
--- a/src/plugins/gtpu/test/test_gtpu.py
+++ b/src/plugins/gtpu/test/test_gtpu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 from util import ip4n_range, ip4_range
diff --git a/src/plugins/igmp/test/test_igmp.py b/src/plugins/igmp/test/test_igmp.py
index f1c49acba4c..e90fbfbf775 100644
--- a/src/plugins/igmp/test/test_igmp.py
+++ b/src/plugins/igmp/test/test_igmp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/src/plugins/l3xc/test/test_l3xc.py b/src/plugins/l3xc/test/test_l3xc.py
index 696e23507ac..7bdddbc4cd8 100644
--- a/src/plugins/l3xc/test/test_l3xc.py
+++ b/src/plugins/l3xc/test/test_l3xc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from socket import inet_pton, inet_ntop, AF_INET, AF_INET6
 import unittest
diff --git a/src/plugins/mactime/test/test_mactime.py b/src/plugins/mactime/test/test_mactime.py
index 892ae02cf22..eb28002c829 100644
--- a/src/plugins/mactime/test/test_mactime.py
+++ b/src/plugins/mactime/test/test_mactime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/src/plugins/map/examples/test_map.py b/src/plugins/map/examples/test_map.py
index 21388d49526..7a48964b3f2 100755
--- a/src/plugins/map/examples/test_map.py
+++ b/src/plugins/map/examples/test_map.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import time,argparse,sys,cmd, unittest
 from ipaddress import *
diff --git a/src/plugins/map/gen-rules.py b/src/plugins/map/gen-rules.py
index 533a8e237f7..e43b8e155be 100755
--- a/src/plugins/map/gen-rules.py
+++ b/src/plugins/map/gen-rules.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (c) 2015 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/plugins/map/test/test_map.py b/src/plugins/map/test/test_map.py
index 866706a085c..a7e5f165576 100644
--- a/src/plugins/map/test/test_map.py
+++ b/src/plugins/map/test/test_map.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import ipaddress
 import unittest
diff --git a/src/plugins/nat/extras/nat_static_gen_cfg.py b/src/plugins/nat/extras/nat_static_gen_cfg.py
index a8e609cb278..9e59bbfc0c2 100755
--- a/src/plugins/nat/extras/nat_static_gen_cfg.py
+++ b/src/plugins/nat/extras/nat_static_gen_cfg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import ipaddress
 import argparse
 
diff --git a/src/plugins/nat/test/test_ipsec_nat.py b/src/plugins/nat/test/test_ipsec_nat.py
index 07670d71b03..dcedf64b52d 100644
--- a/src/plugins/nat/test/test_ipsec_nat.py
+++ b/src/plugins/nat/test/test_ipsec_nat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 
diff --git a/src/plugins/nat/test/test_nat.py b/src/plugins/nat/test/test_nat.py
index 448a7fcf14c..d430c5111a9 100644
--- a/src/plugins/nat/test/test_nat.py
+++ b/src/plugins/nat/test/test_nat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
diff --git a/src/plugins/pppoe/test/test_pppoe.py b/src/plugins/pppoe/test/test_pppoe.py
index 54378673eb4..cce8fe7fc50 100644
--- a/src/plugins/pppoe/test/test_pppoe.py
+++ b/src/plugins/pppoe/test/test_pppoe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
diff --git a/src/plugins/quic/test/test_quic.py b/src/plugins/quic/test/test_quic.py
index 13c6a9ae56e..8b1dba42af8 100644
--- a/src/plugins/quic/test/test_quic.py
+++ b/src/plugins/quic/test/test_quic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Vpp QUIC tests """
 
 import unittest
diff --git a/src/plugins/sctp/test/test_sctp.py b/src/plugins/sctp/test/test_sctp.py
index 75bbb23f31f..25a2aaf544e 100644
--- a/src/plugins/sctp/test/test_sctp.py
+++ b/src/plugins/sctp/test/test_sctp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/src/plugins/srv6-ad/test/test_srv6_ad.py b/src/plugins/srv6-ad/test/test_srv6_ad.py
index aa4b8d3c088..545553ec738 100644
--- a/src/plugins/srv6-ad/test/test_srv6_ad.py
+++ b/src/plugins/srv6-ad/test/test_srv6_ad.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import binascii
diff --git a/src/plugins/srv6-am/test/test_srv6.py b/src/plugins/srv6-am/test/test_srv6.py
index b3e69724028..0f0358f118a 100644
--- a/src/plugins/srv6-am/test/test_srv6.py
+++ b/src/plugins/srv6-am/test/test_srv6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import binascii
diff --git a/src/plugins/srv6-as/test/test_srv6_as.py b/src/plugins/srv6-as/test/test_srv6_as.py
index 2be7865d5bd..26a4bf4f428 100755
--- a/src/plugins/srv6-as/test/test_srv6_as.py
+++ b/src/plugins/srv6-as/test/test_srv6_as.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import binascii
diff --git a/src/plugins/svs/test/test_svs.py b/src/plugins/svs/test/test_svs.py
index 9a9ac57016b..6d3b72e744d 100644
--- a/src/plugins/svs/test/test_svs.py
+++ b/src/plugins/svs/test/test_svs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/src/scripts/host-stack/cc_plots.py b/src/scripts/host-stack/cc_plots.py
index ea2d4c94353..20f5bd6a3f1 100755
--- a/src/scripts/host-stack/cc_plots.py
+++ b/src/scripts/host-stack/cc_plots.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import re
diff --git a/src/scripts/vnet/uri/dummy_app.py b/src/scripts/vnet/uri/dummy_app.py
index 85ea4dcd474..d96a378a193 100755
--- a/src/scripts/vnet/uri/dummy_app.py
+++ b/src/scripts/vnet/uri/dummy_app.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import sys
diff --git a/src/vpp-api/python/vpp_papi/macaddress.py b/src/vpp-api/python/vpp_papi/macaddress.py
index 5005fa8d92e..02c90dbce06 100644
--- a/src/vpp-api/python/vpp_papi/macaddress.py
+++ b/src/vpp-api/python/vpp_papi/macaddress.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2016 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py b/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py
index 5221034da6c..5d6993f91a7 100755
--- a/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py
+++ b/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from vpp_papi.vpp_serializer import VPPType, VPPEnumType
diff --git a/src/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py
index 9c0fa2d02aa..05688cec731 100644
--- a/src/vpp-api/python/vpp_papi/vpp_papi.py
+++ b/src/vpp-api/python/vpp_papi/vpp_papi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2016 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py
index aa576136a7b..1375f118e68 100644
--- a/src/vpp-api/python/vpp_papi/vpp_stats.py
+++ b/src/vpp-api/python/vpp_papi/vpp_stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 from cffi import FFI
diff --git a/src/vpp/stats/stats.md b/src/vpp/stats/stats.md
index 20ca7909baa..8671f56e4a5 100644
--- a/src/vpp/stats/stats.md
+++ b/src/vpp/stats/stats.md
@@ -61,7 +61,7 @@ A new client library can either wrap the C library (libvppapiclient.so) or it ca
 ### Python
 
 ```
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from vpp_papi.vpp_stats import VPPStats
 stats = VPPStats('/run/vpp/stats.sock')
 dir = stats.ls(['^/if', '/err/ip4-input', '/sys/node/ip4-input'])
diff --git a/test/discover_tests.py b/test/discover_tests.py
index 6dea20e3de5..1e581a57b6f 100755
--- a/test/discover_tests.py
+++ b/test/discover_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import os
diff --git a/test/framework.py b/test/framework.py
index 9508297432e..0138d245577 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import gc
diff --git a/test/ipfix.py b/test/ipfix.py
index 374a8522168..5b32a85a2e7 100644
--- a/test/ipfix.py
+++ b/test/ipfix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # IPFIX support for Scapy (RFC7011)
 
 from scapy.all import bind_layers, FieldLenField, IntField, Packet, \
diff --git a/test/log.py b/test/log.py
index b0254f9abee..b0fe037e1ba 100644
--- a/test/log.py
+++ b/test/log.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import os
diff --git a/test/patches/scapy-2.3.3/geneve.patch b/test/patches/scapy-2.3.3/geneve.patch
index 92752f1196e..6db3667b30b 100644
--- a/test/patches/scapy-2.3.3/geneve.patch
+++ b/test/patches/scapy-2.3.3/geneve.patch
@@ -4,7 +4,7 @@ index 0000000..e2ca888
 --- /dev/null
 +++ b/scapy/layers/geneve.py
 @@ -0,0 +1,50 @@
-+#! /usr/bin/env python
++#! /usr/bin/env python3
 +# (GENEVE):
 +# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
 +
diff --git a/test/patches/scapy-2.4/geneve.patch b/test/patches/scapy-2.4/geneve.patch
index 92752f1196e..6db3667b30b 100644
--- a/test/patches/scapy-2.4/geneve.patch
+++ b/test/patches/scapy-2.4/geneve.patch
@@ -4,7 +4,7 @@ index 0000000..e2ca888
 --- /dev/null
 +++ b/scapy/layers/geneve.py
 @@ -0,0 +1,50 @@
-+#! /usr/bin/env python
++#! /usr/bin/env python3
 +# (GENEVE):
 +# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
 +
diff --git a/test/remote_test.py b/test/remote_test.py
index d084133d475..8b3def2b8c6 100644
--- a/test/remote_test.py
+++ b/test/remote_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import inspect
 import os
diff --git a/test/run_tests.py b/test/run_tests.py
index d52209d82b3..09b68a217a5 100644
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import shutil
diff --git a/test/sanity_import_vpp_papi.py b/test/sanity_import_vpp_papi.py
index 535e00c9967..37fbd5a54d5 100644
--- a/test/sanity_import_vpp_papi.py
+++ b/test/sanity_import_vpp_papi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """ sanity check script """
 import vpp_papi
diff --git a/test/sanity_run_vpp.py b/test/sanity_run_vpp.py
index 2ee7d310a35..535d054fe51 100644
--- a/test/sanity_run_vpp.py
+++ b/test/sanity_run_vpp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 from multiprocessing import Pipe
diff --git a/test/template_bd.py b/test/template_bd.py
index 39f71438ab0..c4017616a9b 100644
--- a/test/template_bd.py
+++ b/test/template_bd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import abc
 import six
diff --git a/test/test_bfd.py b/test/test_bfd.py
index d3616c7e241..7d529767d16 100644
--- a/test/test_bfd.py
+++ b/test/test_bfd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ BFD tests """
 
 from __future__ import division
diff --git a/test/test_bier.py b/test/test_bier.py
index b188c364a7a..b02014daa33 100644
--- a/test/test_bier.py
+++ b/test/test_bier.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_bihash.py b/test/test_bihash.py
index ccebea3ac75..04b1b4f635a 100644
--- a/test/test_bihash.py
+++ b/test/test_bihash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_bond.py b/test/test_bond.py
index f6a9b08426b..1b6c10b14ae 100644
--- a/test/test_bond.py
+++ b/test/test_bond.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
diff --git a/test/test_buffers.py b/test/test_buffers.py
index fe92378b484..f50f05c609a 100644
--- a/test/test_buffers.py
+++ b/test/test_buffers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from framework import VppTestCase
 
diff --git a/test/test_classifier.py b/test/test_classifier.py
index 0e6123ce93f..d99f66c991d 100644
--- a/test/test_classifier.py
+++ b/test/test_classifier.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import binascii
 import socket
diff --git a/test/test_classifier_ip6.py b/test/test_classifier_ip6.py
index 0522520d309..464034df1af 100644
--- a/test/test_classifier_ip6.py
+++ b/test/test_classifier_ip6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
diff --git a/test/test_cli.py b/test/test_cli.py
index d3e69e924b5..97885b9b44e 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """CLI functional tests"""
 
 import unittest
diff --git a/test/test_container.py b/test/test_container.py
index 1e3ec40a2f7..68a7dacbb37 100644
--- a/test/test_container.py
+++ b/test/test_container.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Container integration tests """
 
 import unittest
diff --git a/test/test_crypto.py b/test/test_crypto.py
index f921112d9b1..aa62dba1bab 100644
--- a/test/test_crypto.py
+++ b/test/test_crypto.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_dvr.py b/test/test_dvr.py
index 62dcb611d55..d9bb7ac711f 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import unittest
 
 from framework import VppTestCase, VppTestRunner
diff --git a/test/test_fib.py b/test/test_fib.py
index 6acde0a6363..faafdad15b0 100644
--- a/test/test_fib.py
+++ b/test/test_fib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_geneve.py b/test/test_geneve.py
index 56b99518720..d5d621f052e 100644
--- a/test/test_geneve.py
+++ b/test/test_geneve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 from util import ip4_range, ip4_range
diff --git a/test/test_gre.py b/test/test_gre.py
index c5239b2cf9d..6828ac6f919 100644
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_gso.py b/test/test_gso.py
index f6a50a849b1..06ae7dd2f48 100644
--- a/test/test_gso.py
+++ b/test/test_gso.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """GSO functional tests"""
 
 #
diff --git a/test/test_interface_crud.py b/test/test_interface_crud.py
index 4711c2f7931..afeafa5f73b 100644
--- a/test/test_interface_crud.py
+++ b/test/test_interface_crud.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """CRUD tests of APIs (Create, Read, Update, Delete) HLD:
 
 - interface up/down/add/delete - interface type:
diff --git a/test/test_ip4.py b/test/test_ip4.py
index a043be8b922..0f37e73fceb 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import binascii
 import random
 import socket
diff --git a/test/test_ip4_irb.py b/test/test_ip4_irb.py
index df663552f42..20181b0a32b 100644
--- a/test/test_ip4_irb.py
+++ b/test/test_ip4_irb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """IRB Test Case HLD:
 
 **config**
diff --git a/test/test_ip4_vrf_multi_instance.py b/test/test_ip4_vrf_multi_instance.py
index b659ed7064f..f1ad6703604 100644
--- a/test/test_ip4_vrf_multi_instance.py
+++ b/test/test_ip4_vrf_multi_instance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """IP4 VRF Multi-instance Test Case HLD:
 
 **NOTES:**
diff --git a/test/test_ip6.py b/test/test_ip6.py
index a8a730c615c..f5ed09f6683 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
diff --git a/test/test_ip6_vrf_multi_instance.py b/test/test_ip6_vrf_multi_instance.py
index 49e5cab5f6a..31e00dc8e6a 100644
--- a/test/test_ip6_vrf_multi_instance.py
+++ b/test/test_ip6_vrf_multi_instance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """IP6 VRF Multi-instance Test Case HLD:
 
 **NOTES:**
diff --git a/test/test_ip_ecmp.py b/test/test_ip_ecmp.py
index 2fe266023f7..cc93ab731d3 100644
--- a/test/test_ip_ecmp.py
+++ b/test/test_ip_ecmp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import random
diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py
index d1f26d11325..f7a50825d81 100644
--- a/test/test_ip_mcast.py
+++ b/test/test_ip_mcast.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_ipip.py b/test/test_ipip.py
index a259a5d18fa..e723950b7a7 100644
--- a/test/test_ipip.py
+++ b/test/test_ipip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """IP{4,6} over IP{v,6} tunnel functional tests"""
 
 import unittest
diff --git a/test/test_l2_fib.py b/test/test_l2_fib.py
index 4a5cb56352a..106a7902da5 100644
--- a/test/test_l2_fib.py
+++ b/test/test_l2_fib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """L2 FIB Test Case HLD:
 
 **config 1**
diff --git a/test/test_l2_flood.py b/test/test_l2_flood.py
index 8ff0bc2b090..f4d1c07c62c 100644
--- a/test/test_l2_flood.py
+++ b/test/test_l2_flood.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
diff --git a/test/test_l2bd.py b/test/test_l2bd.py
index ecd031188eb..5eca48c6e9b 100644
--- a/test/test_l2bd.py
+++ b/test/test_l2bd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import random
diff --git a/test/test_l2bd_arp_term.py b/test/test_l2bd_arp_term.py
index 279dcf2d3c6..e72a42e1165 100644
--- a/test/test_l2bd_arp_term.py
+++ b/test/test_l2bd_arp_term.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ L2BD ARP term Test """
 
 import unittest
diff --git a/test/test_l2bd_multi_instance.py b/test/test_l2bd_multi_instance.py
index 8ceec745787..cb00a4e0ecc 100644
--- a/test/test_l2bd_multi_instance.py
+++ b/test/test_l2bd_multi_instance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """L2BD Multi-instance Test Case HLD:
 
 **NOTES:**
diff --git a/test/test_l2tp.py b/test/test_l2tp.py
index 6ce7de75d40..c57b5912de1 100644
--- a/test/test_l2tp.py
+++ b/test/test_l2tp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_l2xc.py b/test/test_l2xc.py
index 1e786e48b4d..bc653f0b4fb 100644
--- a/test/test_l2xc.py
+++ b/test/test_l2xc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import random
diff --git a/test/test_l2xc_multi_instance.py b/test/test_l2xc_multi_instance.py
index 061656a8270..2a6e41c8791 100644
--- a/test/test_l2xc_multi_instance.py
+++ b/test/test_l2xc_multi_instance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """L2XC Multi-instance Test Case HLD:
 
 **NOTES:**
diff --git a/test/test_lisp.py b/test/test_lisp.py
index 0b89b1f0d68..e0b82087f69 100644
--- a/test/test_lisp.py
+++ b/test/test_lisp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import abc
 import six
diff --git a/test/test_mpcap.py b/test/test_mpcap.py
index 466e663c799..d77b543799f 100644
--- a/test/test_mpcap.py
+++ b/test/test_mpcap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_mpls.py b/test/test_mpls.py
index 5b3054801e7..f7f634d60bf 100644
--- a/test/test_mpls.py
+++ b/test/test_mpls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
diff --git a/test/test_mtu.py b/test/test_mtu.py
index c18ef9f4cdf..3c938a8cdce 100644
--- a/test/test_mtu.py
+++ b/test/test_mtu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """IP4 and IP6 MTU functional tests"""
 
 #
diff --git a/test/test_neighbor.py b/test/test_neighbor.py
index 81c3acb09a3..7068fd05b04 100644
--- a/test/test_neighbor.py
+++ b/test/test_neighbor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from socket import AF_INET, AF_INET6, inet_pton
diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py
index 8ae6cb26fe0..7a8c56092fb 100644
--- a/test/test_p2p_ethernet.py
+++ b/test/test_p2p_ethernet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import random
 import unittest
 import datetime
diff --git a/test/test_pipe.py b/test/test_pipe.py
index 20e6d2a4e1f..89ef1f3cadb 100644
--- a/test/test_pipe.py
+++ b/test/test_pipe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from socket import AF_INET, AF_INET6, inet_pton
 import unittest
 
diff --git a/test/test_punt.py b/test/test_punt.py
index 345d9309c8b..4b9a05043f8 100644
--- a/test/test_punt.py
+++ b/test/test_punt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import binascii
 import random
 import socket
diff --git a/test/test_qos.py b/test/test_qos.py
index ef4e495fbea..02941a163b4 100644
--- a/test/test_qos.py
+++ b/test/test_qos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_reassembly.py b/test/test_reassembly.py
index ace11f73d3d..e9a3af3a0ff 100644
--- a/test/test_reassembly.py
+++ b/test/test_reassembly.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import six
 import unittest
diff --git a/test/test_session.py b/test/test_session.py
index aceff656e4e..60e5eb4f8a3 100644
--- a/test/test_session.py
+++ b/test/test_session.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_sixrd.py b/test/test_sixrd.py
index ae4af15c2e3..cb2f6799461 100644
--- a/test/test_sixrd.py
+++ b/test/test_sixrd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ 6RD RFC5969 functional tests """
 
 import unittest
diff --git a/test/test_span.py b/test/test_span.py
index 3b31f6242e2..7d58bdfebd2 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_sparse_vec.py b/test/test_sparse_vec.py
index 0cc1a76ed56..a683faefd57 100644
--- a/test/test_sparse_vec.py
+++ b/test/test_sparse_vec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_srmpls.py b/test/test_srmpls.py
index 7e729658b43..cb47328a7c9 100644
--- a/test/test_srmpls.py
+++ b/test/test_srmpls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
diff --git a/test/test_stats_client.py b/test/test_stats_client.py
index 857e6e42832..7d0c91f24fd 100644
--- a/test/test_stats_client.py
+++ b/test/test_stats_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import time
diff --git a/test/test_string.py b/test/test_string.py
index 667bdf0ad4e..ed7b8cdf88d 100644
--- a/test/test_string.py
+++ b/test/test_string.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_syslog.py b/test/test_syslog.py
index 0acf7c221eb..3d20291e51d 100644
--- a/test/test_syslog.py
+++ b/test/test_syslog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from framework import VppTestCase, VppTestRunner
diff --git a/test/test_tcp.py b/test/test_tcp.py
index 393813c4dbb..8decac52b9d 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_tls.py b/test/test_tls.py
index 03f297f9eac..6124dd250f0 100644
--- a/test/test_tls.py
+++ b/test/test_tls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import os
diff --git a/test/test_udp.py b/test/test_udp.py
index 95dddff2c17..40c814774bf 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import unittest
 from framework import VppTestCase, VppTestRunner
 
diff --git a/test/test_util.py b/test/test_util.py
index e7d53668e2b..51cc739ca8d 100755
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Test framework utility functions tests"""
 
 import unittest
diff --git a/test/test_vapi.py b/test/test_vapi.py
index e010415fe01..5dbe56ac6e2 100644
--- a/test/test_vapi.py
+++ b/test/test_vapi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ VAPI test """
 
 import unittest
diff --git a/test/test_vcl.py b/test/test_vcl.py
index c25bad99923..804e7457555 100644
--- a/test/test_vcl.py
+++ b/test/test_vcl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Vpp VCL tests """
 
 import unittest
diff --git a/test/test_vhost.py b/test/test_vhost.py
index 4e5a62d4535..b9cc1102d5d 100644
--- a/test/test_vhost.py
+++ b/test/test_vhost.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
diff --git a/test/test_vom.py b/test/test_vom.py
index a27d5310f52..2d735ee0148 100644
--- a/test/test_vom.py
+++ b/test/test_vom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ VAPI test """
 
 import unittest
diff --git a/test/test_vtr.py b/test/test_vtr.py
index a224909d8cb..239767a5d17 100644
--- a/test/test_vtr.py
+++ b/test/test_vtr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import random
diff --git a/test/test_vxlan.py b/test/test_vxlan.py
index c74efe7d062..b292aac4a12 100644
--- a/test/test_vxlan.py
+++ b/test/test_vxlan.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 from util import ip4n_range, ip4_range, reassemble4
diff --git a/test/test_vxlan6.py b/test/test_vxlan6.py
index 1e382e349c7..b1fda508394 100644
--- a/test/test_vxlan6.py
+++ b/test/test_vxlan6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py
index bd70eefa685..24769337b7c 100644
--- a/test/test_vxlan_gbp.py
+++ b/test/test_vxlan_gbp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 from util import ip4_range, reassemble4_ether
diff --git a/test/test_vxlan_gpe.py b/test/test_vxlan_gpe.py
index f13a5287172..5622a03b467 100644
--- a/test/test_vxlan_gpe.py
+++ b/test/test_vxlan_gpe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 from util import ip4n_range, ip4_range
diff --git a/test/vpp_udp_encap.py b/test/vpp_udp_encap.py
index bdca9a8ca18..aad87bd5912 100644
--- a/test/vpp_udp_encap.py
+++ b/test/vpp_udp_encap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
   UDP encap objects
 """