diff --git a/src/test/builder/buildFsm.sh b/src/test/builder/buildFsm.sh
index f1e309e..ace2f5e 100644
--- a/src/test/builder/buildFsm.sh
+++ b/src/test/builder/buildFsm.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/bin/bash
 odir="$1"
 if [ -z "$odir" ]; then
     odir = "./"
diff --git a/src/test/cordvtn/vtn-setup.sh b/src/test/cordvtn/vtn-setup.sh
index 889be9b..e89e16d 100644
--- a/src/test/cordvtn/vtn-setup.sh
+++ b/src/test/cordvtn/vtn-setup.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/bin/bash
 
 sudo brctl addbr fabric
 sudo ip link set fabric up
diff --git a/src/test/perf/pktgen_dpdk.sh b/src/test/perf/pktgen_dpdk.sh
index dc573c5..a9ca83d 100644
--- a/src/test/perf/pktgen_dpdk.sh
+++ b/src/test/perf/pktgen_dpdk.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/bin/bash
 
 #Get system info
 name=`uname -n`
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index e38a206..d48edff 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -1,22 +1,5 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
 #!/usr/bin/env python
-#
-# Copyright 2016-present Ciena Corporation
+# Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/src/test/setup/cpqd.sh b/src/test/setup/cpqd.sh
index 56a944e..9e70d5f 100755
--- a/src/test/setup/cpqd.sh
+++ b/src/test/setup/cpqd.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-#!/usr/bin/env bash
 dpid=${1:-001122334455}
 num_ports=${2:-200}
 controller=${3:-$ONOS_CONTROLLER_IP}
diff --git a/src/test/setup/eval.sh b/src/test/setup/eval.sh
index 3295fe3..a92caee 100755
--- a/src/test/setup/eval.sh
+++ b/src/test/setup/eval.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-#!/usr/bin/env bash
 cord_tester="$(dirname $0)/cord-test.py"
 if [ ! -f $cord_tester ]; then
   cord_tester="$HOME/cord-tester/src/test/setup/cord-test.py"
diff --git a/src/test/setup/of-bridge-local.sh b/src/test/setup/of-bridge-local.sh
index 8f761a9..3a54962 100755
--- a/src/test/setup/of-bridge-local.sh
+++ b/src/test/setup/of-bridge-local.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/usr/bin/env bash
 bridge="$1"
 controller="$2"
 voltha_loc="$3"
diff --git a/src/test/setup/of-bridge-template.sh b/src/test/setup/of-bridge-template.sh
index d2c3299..f150201 100755
--- a/src/test/setup/of-bridge-template.sh
+++ b/src/test/setup/of-bridge-template.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/usr/bin/env bash
 bridge="$1"
 controller="$2"
 if [ x"$bridge" = "x" ]; then
diff --git a/src/test/setup/of-bridge.sh b/src/test/setup/of-bridge.sh
index 18ad890..cd56e6c 100755
--- a/src/test/setup/of-bridge.sh
+++ b/src/test/setup/of-bridge.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/usr/bin/env bash
 bridge="$1"
 controller="$2"
 if [ x"$bridge" = "x" ]; then
diff --git a/src/test/setup/onos_pull.sh b/src/test/setup/onos_pull.sh
index 73791e4..ebd463b 100755
--- a/src/test/setup/onos_pull.sh
+++ b/src/test/setup/onos_pull.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/usr/bin/env bash
 ##Use this script as SUDO to pull ONOS safely as it saves/archives repo digest ids.
 ##Repo digest ids are saved in $HOME/onos_repo_digest.txt
 tag=${1:-latest}
@@ -25,4 +24,4 @@
 repo=`echo $digest | cut -d ":" -f2- | sed 's,[[:space:]]*,,'`
 echo "ONOS $tag repo id $repo saved in $repo_digest"
 d=`date +%D`
-echo "$d onosproject/onos:$tag $repo" >>$repo_digest
\ No newline at end of file
+echo "$d onosproject/onos:$tag $repo" >>$repo_digest
diff --git a/src/test/setup/prerequisites.sh b/src/test/setup/prerequisites.sh
index dbe5206..5a0944b 100755
--- a/src/test/setup/prerequisites.sh
+++ b/src/test/setup/prerequisites.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 # Copyright 2017-present Open Networking Foundation
 #
@@ -13,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-#!/usr/bin/env bash
-
 function usage {
     echo "usage: ${0#*/} [-h |--help] [--cord] [--venv]"
     exit 1
diff --git a/src/test/setup/quagga-config/start.sh b/src/test/setup/quagga-config/start.sh
index 543198d..3adabf4 100755
--- a/src/test/setup/quagga-config/start.sh
+++ b/src/test/setup/quagga-config/start.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-#!/bin/bash
 ulimit -n 65536
 ip a add 10.10.0.3/16 dev eth1
 #bgpd -u root -f /root/config/bgpd.conf &
diff --git a/src/test/setup/quagga-config/stop.sh b/src/test/setup/quagga-config/stop.sh
index f9b104b..ab11808 100755
--- a/src/test/setup/quagga-config/stop.sh
+++ b/src/test/setup/quagga-config/stop.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,5 +14,4 @@
 # limitations under the License.
 
 
-#!/bin/bash
-pkill -9 zebra
\ No newline at end of file
+pkill -9 zebra
diff --git a/src/test/setup/webserver-run.py b/src/test/setup/webserver-run.py
index 4b68c89..a13ebd3 100755
--- a/src/test/setup/webserver-run.py
+++ b/src/test/setup/webserver-run.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,5 @@
 # limitations under the License.
 
 
-#!/usr/bin/env python
 from webserver import app
 app.run(debug=True, port = 5000)