diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index ffb67d95..ac76dc66 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -9,10 +9,11 @@ RUN apk add --no-cache \
 	coreutils linux-headers \
 	make musl-dev gcc bison flex \
 	zlib-dev libedit-dev \
-	pkgconf icu-dev clang clang15 clang-analyzer;
+	pkgconf icu-dev clang clang-analyzer;
 
 # Need this for Travis CI to pass
 RUN if [ "${PG_VERSION}" == "13" ] ; then apk add --no-cache clang19; fi
+RUN if [ "${PG_VERSION}" == "11" ] ; then apk add --no-cache clang15; fi
 
 # Install fresh valgrind
 RUN apk add valgrind \
diff --git a/run_tests.sh b/run_tests.sh
index 2e2edc6f..55fc2c30 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -108,7 +108,11 @@ if [ "$LEVEL" = "scan-build" ] || \
    [ "$LEVEL" = "nightmare" ]; then
 
 	# perform static analyzis
-	scan-build --status-bugs make USE_PGXS=1 || status=$?
+	if [ "${PG_VERSION%.*}" = "11" ]; then
+		scan-build --status-bugs make USE_PGXS=1 CLANG=clang-15 || status=$?
+	else
+		scan-build --status-bugs make USE_PGXS=1 CLANG=clang || status=$?
+	fi
 
 	# something's wrong, exit now!
 	if [ $status -ne 0 ]; then exit 1; fi