diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android-gcc.sh
similarity index 98%
rename from TestScripts/setenv-android.sh
rename to TestScripts/setenv-android-gcc.sh
index c66ed236..32973cf0 100755
--- a/TestScripts/setenv-android.sh
+++ b/TestScripts/setenv-android-gcc.sh
@@ -71,7 +71,7 @@ if [ -z "${AOSP_API-}" ]; then
 else
 	echo "WARNING: Using AOSP_API has been deprecated. Please use AOSP_API_VERSION instead."
 	echo "If you set for example AOSP_API=android-23 then now instead set AOSP_API_VERSION=23"
-	exit 1
+	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
 fi
 
 #####################################################################
@@ -126,8 +126,8 @@ case "$THE_ARCH" in
 	AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti"
 	;;
   hard|armv7a-hard|armeabi-v7a-hard)
-    echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats
-    exit 1
+	echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats
+	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
 	#TOOLCHAIN_ARCH="arm-linux-androideabi"
 	#TOOLCHAIN_NAME="arm-linux-androideabi"
 	#AOSP_ABI="armeabi-v7a"
diff --git a/setenv-android.sh b/setenv-android-gcc.sh
similarity index 98%
rename from setenv-android.sh
rename to setenv-android-gcc.sh
index c66ed236..32973cf0 100755
--- a/setenv-android.sh
+++ b/setenv-android-gcc.sh
@@ -71,7 +71,7 @@ if [ -z "${AOSP_API-}" ]; then
 else
 	echo "WARNING: Using AOSP_API has been deprecated. Please use AOSP_API_VERSION instead."
 	echo "If you set for example AOSP_API=android-23 then now instead set AOSP_API_VERSION=23"
-	exit 1
+	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
 fi
 
 #####################################################################
@@ -126,8 +126,8 @@ case "$THE_ARCH" in
 	AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti"
 	;;
   hard|armv7a-hard|armeabi-v7a-hard)
-    echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats
-    exit 1
+	echo hard, armv7a-hard and armeabi-v7a-hard are not supported, as android uses softfloats
+	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
 	#TOOLCHAIN_ARCH="arm-linux-androideabi"
 	#TOOLCHAIN_NAME="arm-linux-androideabi"
 	#AOSP_ABI="armeabi-v7a"