diff --git a/hpvm/scripts/automate_tests.sh b/hpvm/scripts/automate_tests.sh
index 565d20754732b77f58acc96b08cd96bfb29ba6e2..aece74eaa0a59e2e91807e9444c5c10054126cdd 100644
--- a/hpvm/scripts/automate_tests.sh
+++ b/hpvm/scripts/automate_tests.sh
@@ -2,10 +2,12 @@
 
 CURRENT_DIR=`pwd`
 BUILD_DIR=$CURRENT_DIR/build
+HPVM_RT=hpvm-rt/hpvm-rt.bc
 
-if [ -x $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
+if [ -f $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
     true
 else
+    echo $BUILD_DIR/tools/hpvm/projects/$HPVM_RT
     echo HPVM not installed! Exiting without running tests!.
     exit 0
 fi
diff --git a/hpvm/scripts/llvm_installer.sh b/hpvm/scripts/llvm_installer.sh
index f878ae077c043dbc03b3bae3be16494ce676f9a2..4de8d15dfd770b021eace442a4f6fb1dc701c2b5 100755
--- a/hpvm/scripts/llvm_installer.sh
+++ b/hpvm/scripts/llvm_installer.sh
@@ -19,7 +19,7 @@ LLVM_SRC="llvm-$VERSION.src"
 LIBCXX_SRC="libcxx-$VERSION.src"
 LIBCXXABI_SRC="libcxxabi-$VERSION.src"
 
-HPVM_RT=hpvm-rt.bc
+HPVM_RT=hpvm-rt/hpvm-rt.bc
 
 AUTOMATE="y"
 
@@ -182,9 +182,10 @@ make -j$NUM_THREADS
 #make install
 
 
-if [ -x $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
+if [ -f $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
     true
 else
+    echo $BUILD_DIR/tools/hpvm/projects/$HPVM_RT
     echo HPVM not installed properly.
     exit 0
 fi