diff --git a/tests/device/asan-smoke/test_config.py b/tests/device/asan-smoke/test_config.py
index 14c0a37..f5903ad 100644
--- a/tests/device/asan-smoke/test_config.py
+++ b/tests/device/asan-smoke/test_config.py
@@ -1,4 +1,6 @@
 def match_unsupported(abi, platform, toolchain, subtest=None):
     if not toolchain.startswith('clang'):
         return toolchain
+    if not abi.startswith('armeabi'):
+        return abi
     return None
diff --git a/tests/run-all.py b/tests/run-all.py
index dbda6e7..15e4413 100644
--- a/tests/run-all.py
+++ b/tests/run-all.py
@@ -291,7 +291,9 @@
 
         os.environ['ANDROID_SERIAL'] = get_test_device()
 
-        asan_device_setup()
+        # ASAN is currently only supported for 32-bit ARM.
+        if args.abi.startswith('armeabi'):
+            asan_device_setup()
 
     runner = tests.TestRunner()
     if 'awk' in suites: