diff --git a/tests/gnrc_tcp/Makefile b/tests/gnrc_tcp/Makefile
index bd1b2cd3b6..fa5e80def0 100644
--- a/tests/gnrc_tcp/Makefile
+++ b/tests/gnrc_tcp/Makefile
@@ -12,8 +12,6 @@ TIMEOUT_MS ?= 3000
 # Suppress test execution to avoid CI errors
 TEST_ON_CI_BLACKLIST += all
 
-CFLAGS += -DCONFIG_SHELL_NO_ECHO
-
 ifeq (native,$(BOARD))
   TERMFLAGS ?= $(TAP)
 else
@@ -54,3 +52,8 @@ endif
 ifndef CONFIG_GNRC_TCP_CONNECTION_TIMEOUT_DURATION_MS
   CFLAGS += -DCONFIG_GNRC_TCP_CONNECTION_TIMEOUT_DURATION_MS=$(TIMEOUT_MS)
 endif
+
+# Set the shell echo configuration via CFLAGS if not being controlled via Kconfig
+ifndef CONFIG_KCONFIG_USEMODULE_SHELL
+  CFLAGS += -DCONFIG_SHELL_NO_ECHO
+endif
diff --git a/tests/test_tools/Makefile b/tests/test_tools/Makefile
index bdbda5c3fe..62788a6931 100644
--- a/tests/test_tools/Makefile
+++ b/tests/test_tools/Makefile
@@ -3,9 +3,6 @@ include ../Makefile.tests_common
 
 USEMODULE += shell
 
-# Disable shell echo and prompt to not have them in the way for testing
-CFLAGS += -DCONFIG_SHELL_NO_ECHO=1 -DCONFIG_SHELL_NO_PROMPT=1
-
 # No need for test_utils_interactive_sync in this test since the test
 # synchronizes by itself through `shellping` command.
 DISABLE_MODULE += test_utils_interactive_sync
@@ -14,3 +11,9 @@ DISABLE_MODULE += test_utils_interactive_sync
 USEMODULE += dummy_thread
 
 include $(RIOTBASE)/Makefile.include
+
+# Set the shell echo configuration via CFLAGS if not being controlled via Kconfig
+# Disable shell echo and prompt to not have them in the way for testing
+ifndef CONFIG_KCONFIG_USEMODULE_SHELL
+  CFLAGS += -DCONFIG_SHELL_NO_ECHO -DCONFIG_SHELL_NO_PROMPT
+endif