diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
old mode 100644
new mode 100755
index f297deefe2..46b5ecd9d9
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # SPDX-License-Identifier: Unlicense
 #
diff --git a/src/fuzz/fuzz-bootspec-gen.py b/src/fuzz/fuzz-bootspec-gen.py
index 99af3f5f69..a73e59203b 100644
--- a/src/fuzz/fuzz-bootspec-gen.py
+++ b/src/fuzz/fuzz-bootspec-gen.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 """Generate sample input for fuzz-bootspec"""
diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py
index 34908e7ed9..6c80c3e654 100755
--- a/test/integration-tests/integration-test-wrapper.py
+++ b/test/integration-tests/integration-test-wrapper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 """Test wrapper command for driving integration tests."""
diff --git a/tools/analyze-dump-sort.py b/tools/analyze-dump-sort.py
index cc9a9fcd37..a464a14bd1 100755
--- a/tools/analyze-dump-sort.py
+++ b/tools/analyze-dump-sort.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 # pylint: disable=consider-using-with
 
diff --git a/tools/check-efi-alignment.py b/tools/check-efi-alignment.py
index 26d5f5e40d..abdeb22fdb 100755
--- a/tools/check-efi-alignment.py
+++ b/tools/check-efi-alignment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 # vi: set tw=110 sw=4 ts=4 et:
 
diff --git a/tools/dump-auxv.py b/tools/dump-auxv.py
index d6dbcb1f07..1abacda9c1 100644
--- a/tools/dump-auxv.py
+++ b/tools/dump-auxv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 #
 # Note: the no-value-for-parameter here is expected, as the click module