diff --git a/build-test.sh b/build-test.sh
index 81b59eb3cc8b..d845185bcdcc 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -154,10 +154,6 @@ generate_layout()
 
     # Make sure to copy over the pulled down packages
     cp -r $__BinDir/* $CORE_ROOT/ > /dev/null
-    
-    nextCommand="\"$__TestDir/setup-stress-dependencies.sh\" --outputDir=$CORE_ROOT"
-    echo "Resolve runtime dependences via $nextCommand"
-    eval $nextCommand
 }
 
 generate_testhost()
diff --git a/init-distro-rid.sh b/init-distro-rid.sh
old mode 100755
new mode 100644
diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh
index 56c37b20f83e..8c695b379f55 100755
--- a/tests/setup-stress-dependencies.sh
+++ b/tests/setup-stress-dependencies.sh
@@ -147,7 +147,7 @@ initDistroRidGlobal ${__BuildOS} x64 ${isPortable}
 # The CoreDisTools package is currently manually packaged and we only have
 # 14.04 and 16.04 packages. Use the oldest package which will work on newer
 # platforms.
-if [[ ${__BuildOS} == "Linux" ]]; then
+if [[ ${__DistroRid} == "ubuntu"* ]]; then
    __DistroRid=ubuntu.14.04
 fi
 
@@ -170,8 +170,6 @@ fi
 
 # Get library path
 libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools`
-echo "libPath to be used: ${libPath}"
-
 if [ ! -e $libPath ] || [ -z "$libPath" ]; then
     exit_with_error 1 'Failed to locate the downloaded library'
 fi