diff --git a/run-tests.sh b/run-tests.sh
index 424f3a7..598eefa 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -99,25 +99,25 @@ for arch in $ARCHS; do
         RUN="$RUN_I686"
         COPY="$COPY_I686"
         NATIVE="$NATIVE_X86"
-        HAVE_SANITIZERS=1
+        HAVE_ASAN=1
         ;;
     x86_64)
         RUN="$RUN_X86_64"
         COPY="$COPY_X86_64"
         NATIVE="$NATIVE_X86"
-        HAVE_SANITIZERS=1
+        HAVE_ASAN=1
         ;;
     armv7)
         RUN="$RUN_ARMV7"
         COPY="$COPY_ARMV7"
         NATIVE="$NATIVE_ARMV7"
-        unset HAVE_SANITIZERS
+        unset HAVE_ASAN
         ;;
     aarch64)
         RUN="$RUN_AARCH64"
         COPY="$COPY_AARCH64"
         NATIVE="$NATIVE_AARCH64"
-        unset HAVE_SANITIZERS
+        unset HAVE_ASAN
         ;;
     esac
 
@@ -137,8 +137,8 @@ for arch in $ARCHS; do
     [ -z "$CLEAN" ] || rm -rf $TEST_DIR
     mkdir -p $TEST_DIR
     cd $TEST_DIR
-    $MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_SANITIZERS=$HAVE_SANITIZERS NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin clean
-    $MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_SANITIZERS=$HAVE_SANITIZERS NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin RUN="$RUN" $COPYARG $MAKEOPTS -j$CORES $TARGET
+    $MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_ASAN=$HAVE_ASAN NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin clean
+    $MAKE -f ../Makefile ARCH=$arch HAVE_UWP=$HAVE_UWP HAVE_CFGUARD=$HAVE_CFGUARD HAVE_ASAN=$HAVE_ASAN NATIVE=$NATIVE RUNTIMES_SRC=$PREFIX/$arch-w64-mingw32/bin RUN="$RUN" $COPYARG $MAKEOPTS -j$CORES $TARGET
     cd ..
 done
 echo All tests succeeded
diff --git a/test/Makefile b/test/Makefile
index d75870e..8b39ab4 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -76,10 +76,10 @@ TESTS_CPP_DLL = tlstest-lib throwcatch-lib
 TESTS_CPP_LINK_DLL = throwcatch-main
 TESTS_SSP = stacksmash
 TESTS_FORTIFY = bufferoverflow crt-test
-ifneq ($(HAVE_SANITIZERS),)
+ifneq ($(HAVE_ASAN),)
     TESTS_ASAN = stacksmash
-    TESTS_UBSAN = ubsan
 endif
+TESTS_UBSAN = ubsan
 ifneq ($(HAVE_OPENMP),)
     TESTS_OMP = hello-omp
 endif