diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 392bbfc6f..cff3642f5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps clang-7 valgrind
+          install_linux_deps clang-7 llvm
 
       - name: Build
         run: |
@@ -94,15 +94,12 @@ jobs:
         env:
           CC: clang-7
           CXX: clang++-7
+          CMAKE_FLAGS: '-DCMAKE_C_FLAGS="-fsanitize=address" -DCMAKE_CXX_FLAGS="-fsanitize=address"'
 
       - name: Unittest
         run: |
           ./bin/minetest --run-unittests
 
-      - name: Valgrind
-        run: |
-          valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
-
   # Current clang version
   clang_14:
     runs-on: ubuntu-22.04
diff --git a/src/unittest/test_datastructures.cpp b/src/unittest/test_datastructures.cpp
index a7e24b989..cd3755a1f 100644
--- a/src/unittest/test_datastructures.cpp
+++ b/src/unittest/test_datastructures.cpp
@@ -108,6 +108,8 @@ void TestDataStructures::testMap1()
 			break;
 	}
 	UASSERT(once);
+
+	map.clear(); // ASan complains about stack-use-after-scope otherwise
 }
 
 void TestDataStructures::testMap2()
@@ -121,6 +123,8 @@ void TestDataStructures::testMap2()
 	UASSERT(t0.deleted);
 	UASSERT(!t1.copied);
 	UASSERT(!t1.deleted);
+
+	map.clear();
 }
 
 void TestDataStructures::testMap3()