diff --git a/contrib/share_driver_hooks/zaqar_notification_example_consumer.py b/contrib/share_driver_hooks/zaqar_notification_example_consumer.py
index adaf9fa3b9..cef64bfa5f 100755
--- a/contrib/share_driver_hooks/zaqar_notification_example_consumer.py
+++ b/contrib/share_driver_hooks/zaqar_notification_example_consumer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015 Mirantis, Inc.
 # All Rights Reserved.
diff --git a/manila/cmd/api.py b/manila/cmd/api.py
index 46490e85dd..fd8224488b 100644
--- a/manila/cmd/api.py
+++ b/manila/cmd/api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
diff --git a/manila/cmd/data.py b/manila/cmd/data.py
index fe22b2cf22..91a284cb9d 100644
--- a/manila/cmd/data.py
+++ b/manila/cmd/data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015, Hitachi Data Systems.
 #
diff --git a/manila/cmd/manage.py b/manila/cmd/manage.py
index 4e6e3139c3..3cdcb74d12 100644
--- a/manila/cmd/manage.py
+++ b/manila/cmd/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
 # Copyright 2010 United States Government as represented by the
diff --git a/manila/cmd/scheduler.py b/manila/cmd/scheduler.py
index 457e96d194..a06d30d748 100644
--- a/manila/cmd/scheduler.py
+++ b/manila/cmd/scheduler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
diff --git a/manila/cmd/share.py b/manila/cmd/share.py
index 3b0719b700..7a8ac4f6ef 100644
--- a/manila/cmd/share.py
+++ b/manila/cmd/share.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2013 NetApp
 # All Rights Reserved.
diff --git a/manila/share/configuration.py b/manila/share/configuration.py
index ceb6db0f17..c5b444e9f9 100644
--- a/manila/share/configuration.py
+++ b/manila/share/configuration.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-
+#
 # Copyright (c) 2012 Rackspace Hosting
 # Copyright (c) 2013 NetApp
 # All Rights Reserved.
diff --git a/tools/validate-json-files.py b/tools/validate-json-files.py
index 6f2b72dca2..f94095474e 100644
--- a/tools/validate-json-files.py
+++ b/tools/validate-json-files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at