diff --git a/tests/asan-check/run_checks.sh b/tests/asan-check/run_checks.sh
index 69fda5f60a4..8dae9cf930e 100755
--- a/tests/asan-check/run_checks.sh
+++ b/tests/asan-check/run_checks.sh
@@ -6,22 +6,25 @@ function check_with_asan() {
   local n_procs use_procs
   n_procs="$(getconf _NPROCESSORS_ONLN)"
   use_procs=$((n_procs/2))
-  if [ "$use_procs" -lt "1" ]; then
+  if [ "$use_procs" -lt 1 ]; then
     use_procs=1
   fi
 
   local asan_flags="-fsanitize=address"
 
-  ./autogen.sh --enable-debug &&
+  # Assume we are in core directory
+  if [ -f ./configure ] ; then
+    ./configure -C --enable-debug
+  else
+    ./autogen.sh -C --enable-debug
+  fi
   make -j"${use_procs}" CFLAGS="-Werror -Wall -Wextra -Wno-sign-compare ${asan_flags}" LDFLAGS="${asan_flags}" &&
   make -C tests/unit CFLAGS="${asan_flags}" LDFLAGS="${asan_flags}" check
 }
 
 cd "$(dirname "$0")"/../../
 
-failure=0
 if ! check_with_asan; then
   echo "FAIL: ASAN compile/unit check failed";
-  failure=1;
+  exit 1;
 fi
-exit $failure