diff --git a/test/system/test_tpm2_loadexternal.sh b/test/system/test_tpm2_loadexternal.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 alg_primary_obj=0x000B
 alg_primary_key=0x0001
 alg_create_obj=0x000B

diff --git a/test/system/test_tpm2_makecredential.sh b/test/system/test_tpm2_makecredential.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 handle_ek=0x81010007
 handle_ak=0x81010008
 ek_alg=0x001

diff --git a/test/system/test_tpm2_nv.sh b/test/system/test_tpm2_nv.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 
  nv_test_index=0x1500018
  nv_auth_handle=0x40000001

diff --git a/test/system/test_tpm2_pcrevent.sh b/test/system/test_tpm2_pcrevent.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2017, Intel Corporation

diff --git a/test/system/test_tpm2_pcrextend.sh b/test/system/test_tpm2_pcrextend.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2017, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/sh
 
 declare -A alg_hashes=(
   ["sha"]="f1d2d2f924e986ac86fdf7b36c94bcdf32beec15"

diff --git a/test/system/test_tpm2_pcrlist.sh b/test/system/test_tpm2_pcrlist.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 
 
 tpm2_pcrlist 

diff --git a/test/system/test_tpm2_quote.sh b/test/system/test_tpm2_quote.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 alg_primary_obj=sha256
 alg_primary_key=rsa
 alg_create_obj=0x000B

diff --git a/test/system/test_tpm2_rc_decode.sh b/test/system/test_tpm2_rc_decode.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 
 onerror() {
     echo "$BASH_COMMAND on line ${BASH_LINENO[0]} failed: $?"

diff --git a/test/system/test_tpm2_readpublic.sh b/test/system/test_tpm2_readpublic.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 alg_primary_obj=0x000B
 alg_primary_key=0x0001
 alg_create_obj=0x000B

diff --git a/test/system/test_tpm2_rsadecrypt.sh b/test/system/test_tpm2_rsadecrypt.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 file_primary_key_ctx=context.p_B1
 file_rsaencrypt_key_pub=opuB1_B8
 file_rsaencrypt_key_priv=oprB1_B8

diff --git a/test/system/test_tpm2_rsaencrypt.sh b/test/system/test_tpm2_rsaencrypt.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 file_primary_key_ctx=context.p_B1
 file_rsaencrypt_key_pub=opuB1_B8
 file_rsaencrypt_key_priv=oprB1_B8

diff --git a/test/system/test_tpm2_send_command.sh b/test/system/test_tpm2_send_command.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation

diff --git a/test/system/test_tpm2_sign.sh b/test/system/test_tpm2_sign.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 
 file_primary_key_ctx=context.p_B1
 file_signing_key_pub=opuB1_B8

diff --git a/test/system/test_tpm2_startup.sh b/test/system/test_tpm2_startup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation

diff --git a/test/system/test_tpm2_takeownership_all.sh b/test/system/test_tpm2_takeownership_all.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 
 ownerPasswd=abc123
 endorsePasswd=abc123

diff --git a/test/system/test_tpm2_unseal.sh b/test/system/test_tpm2_unseal.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 alg_primary_obj=0x0004
 alg_primary_key=0x0001
 alg_create_obj=0x000B

diff --git a/test/system/test_tpm2_verifysignature.sh b/test/system/test_tpm2_verifysignature.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #;**********************************************************************;
 #
 # Copyright (c) 2016, Intel Corporation
@@ -29,7 +30,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
-#!/bin/bash
 file_primary_key_ctx=context.p_B1
 file_signing_key_pub=opuB1_B8
 file_signing_key_priv=oprB1_B8