diff --git a/libwvdrmengine/build_all_unit_tests.sh b/libwvdrmengine/build_all_unit_tests.sh
index 8bd360e8..f1f3be5f 100755
--- a/libwvdrmengine/build_all_unit_tests.sh
+++ b/libwvdrmengine/build_all_unit_tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -23,7 +23,7 @@ while getopts "j:s:" opt; do
 done
 
 # Define the relevant aliases
-. $ANDROID_BUILD_TOP/build/envsetup.sh
+source $ANDROID_BUILD_TOP/build/envsetup.sh
 
 # Build all the targets
 # This list is slightly longer than the one in run_all_unit_tests.sh because
diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh
index cfd3e0c3..441a7d79 100755
--- a/libwvdrmengine/build_and_run_all_unit_tests.sh
+++ b/libwvdrmengine/build_and_run_all_unit_tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Build the tests using build_all_unit_tests.sh
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
diff --git a/libwvdrmengine/move_widevine_data.sh b/libwvdrmengine/move_widevine_data.sh
index dfdd852a..4c1c7b7d 100755
--- a/libwvdrmengine/move_widevine_data.sh
+++ b/libwvdrmengine/move_widevine_data.sh
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/bash
 
 DEST_PATH="/data/vendor/mediadrm"
 FILES_MOVED="/data/vendor/mediadrm/files_moved"
diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index a620ac10..999579a4 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Read arguments in case the user wants to copy files to a specific
 # android device by providing a serial number
diff --git a/libwvdrmengine/run_gts_and_cts_tests.sh b/libwvdrmengine/run_gts_and_cts_tests.sh
index 58e76c01..563adc8d 100755
--- a/libwvdrmengine/run_gts_and_cts_tests.sh
+++ b/libwvdrmengine/run_gts_and_cts_tests.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 # Helper script to use atest to run the MediaDrm CTS and GTS tests
 
diff --git a/libwvdrmengine/run_reboot_test.sh b/libwvdrmengine/run_reboot_test.sh
index 1736723c..eafee593 100755
--- a/libwvdrmengine/run_reboot_test.sh
+++ b/libwvdrmengine/run_reboot_test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Read arguments in case the user wants to copy files to a specific
 # android device by providing a serial number