diff --git a/ChangeLog.txt b/ChangeLog.txt
index 46e84cda..ef88266e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,10 +5,13 @@
 - Fix MOSQ_EVT_DISCONNECT being called before MOSQ_EVT_ACL_CHECK for the will
   of that client. Closes #3487.
 
-Plugins
+# Plugins
 - Fix migrate_to_persist_sqlite.py not base64 decoding message payloads when
   migrating. Closes #3492.
 
+# Build:
+- Fix test building with WITH_EDITLINE=no. Closes #3484.
+
 
 2.1.2 - 2026-02-09
 ==================
diff --git a/test/mock/Makefile b/test/mock/Makefile
index 136abf33..e01c2904 100644
--- a/test/mock/Makefile
+++ b/test/mock/Makefile
@@ -15,9 +15,11 @@ LOCAL_CPPFLAGS+= \
 LOCAL_CXXFLAGS+=-std=c++20 -Wall -ggdb -D TEST_SOURCE_DIR='"$(realpath .)"'
 
 MOCKS = \
-	editline_mock.o \
 	pthread_mock.o
 
+ifeq ($(WITH_EDITLINE),yes)
+MOCKS+=editline_mock.o
+endif
 
 all : test-compile
 test-compile : ${MOCKS}
diff --git a/test/mock/apps/mosquitto_ctrl/Makefile b/test/mock/apps/mosquitto_ctrl/Makefile
index e6aada75..53de22ce 100644
--- a/test/mock/apps/mosquitto_ctrl/Makefile
+++ b/test/mock/apps/mosquitto_ctrl/Makefile
@@ -18,10 +18,16 @@ LOCAL_CXXFLAGS+=-std=c++20 -Wall -ggdb -D TEST_SOURCE_DIR='"$(realpath .)"'
 MOCK_OBJS = \
 	ctrl_shell_mock.o
 
+ifeq ($(WITH_EDITLINE),yes)
 all : test-compile
-
 test-compile: ${MOCK_OBJS}
 check : test
+else
+all :
+test-compile:
+check :
+endif
+
 
 # MOCKS