diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index bcc3aa9d18..18f9660040 100644
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -544,7 +544,3 @@ def main():
 
     mgr = DhcpAgent(cfg.CONF)
     mgr.run()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index 41313b1192..32e80fb33f 100644
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -552,7 +552,3 @@ def main():
 
     mgr = L3NATAgent(conf)
     mgr.daemon_loop()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/quantum/debug/shell.py b/quantum/debug/shell.py
index f2495d2e0f..65c9dc85f6 100644
--- a/quantum/debug/shell.py
+++ b/quantum/debug/shell.py
@@ -79,6 +79,3 @@ class QuantumDebugShell(QuantumShell):
 
 def main(argv=None):
     return QuantumDebugShell(QUANTUM_API_VERSION).run(argv or sys.argv[1:])
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/quantum/plugins/cisco/client/cli.py b/quantum/plugins/cisco/client/cli.py
old mode 100644
new mode 100755
index 7530ddb770..333bd0caf5
--- a/quantum/plugins/cisco/client/cli.py
+++ b/quantum/plugins/cisco/client/cli.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2011 Cisco Systems, Inc.  All rights reserved.
diff --git a/quantum/plugins/cisco/run_tests.py b/quantum/plugins/cisco/run_tests.py
old mode 100644
new mode 100755
diff --git a/quantum/plugins/cisco/services/service_insertion.py b/quantum/plugins/cisco/services/service_insertion.py
old mode 100644
new mode 100755
index afd6b6041c..19af73abfc
--- a/quantum/plugins/cisco/services/service_insertion.py
+++ b/quantum/plugins/cisco/services/service_insertion.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2011 Cisco Systems, Inc.  All rights reserved.