diff --git a/include/spdk/queue.h b/include/spdk/queue.h
index a24dd0070..24e2e2e20 100644
--- a/include/spdk/queue.h
+++ b/include/spdk/queue.h
@@ -50,6 +50,28 @@ extern "C" {
 #include "spdk/queue_extras.h"
 #endif
 
+/*
+ * scan-build can't follow double pointers in queues and often assumes
+ * that removed elements are still on the list. We redefine TAILQ_REMOVE
+ * with extra asserts to silence it.
+ */
+#ifdef __clang_analyzer__
+#undef TAILQ_REMOVE
+#define TAILQ_REMOVE(head, elm, field) do {				\
+	__typeof__(elm) _elm;						\
+	if (((elm)->field.tqe_next) != NULL)				\
+		(elm)->field.tqe_next->field.tqe_prev =			\
+		    (elm)->field.tqe_prev;				\
+	else								\
+		(head)->tqh_last = (elm)->field.tqe_prev;		\
+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+	/* make sure the removed elm is not on the list anymore */	\
+	TAILQ_FOREACH(_elm, head, field) {				\
+		assert(_elm != elm);					\
+	}								\
+} while (0)
+#endif
+
 #ifdef __cplusplus
 }
 #endif