diff --git a/examples/paho-mqtt/Makefile b/examples/paho-mqtt/Makefile
index 744556baf6..bf1570ff40 100644
--- a/examples/paho-mqtt/Makefile
+++ b/examples/paho-mqtt/Makefile
@@ -33,8 +33,9 @@ USEMODULE += ps
 USEMODULE += netdev_default
 USEPKG += paho-mqtt
 
-# paho-mqtt depends on TCP support, choose the stack you want
+# paho-mqtt depends on TCP support, choose which stacks you want
 LWIP_IPV4 ?= 0
+LWIP_IPV6 ?= 1
 
 ifneq (0,$(LWIP_IPV4))
   USEMODULE += ipv4_addr
@@ -42,9 +43,6 @@ ifneq (0,$(LWIP_IPV4))
   USEMODULE += lwip_ipv4
   USEMODULE += lwip_dhcp_auto
   CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
-  LWIP_IPV6 ?= 0
-else
-  LWIP_IPV6 ?= 1
 endif
 
 ifneq (0,$(LWIP_IPV6))
diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile
index c7b2472561..f3d7ea6fb9 100644
--- a/tests/lwip/Makefile
+++ b/tests/lwip/Makefile
@@ -1,6 +1,7 @@
 include ../Makefile.tests_common
 
 LWIP_IPV4 ?= 0
+LWIP_IPV6 ?= 1
 
 ifneq (0, $(LWIP_IPV4))
   USEMODULE += ipv4_addr
@@ -8,10 +9,6 @@ ifneq (0, $(LWIP_IPV4))
   USEMODULE += lwip_ipv4
   USEMODULE += lwip_dhcp_auto
   CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
-  LWIP_IPV6 ?= 0
-else
-  # use IPv6 as default IP protocol when IPv4 is not explicitly selected
-  LWIP_IPV6 ?= 1
 endif
 
 ifneq (0, $(LWIP_IPV6))
diff --git a/tests/lwip_sock_ip/Makefile b/tests/lwip_sock_ip/Makefile
index 8df768efab..d0dd12a82c 100644
--- a/tests/lwip_sock_ip/Makefile
+++ b/tests/lwip_sock_ip/Makefile
@@ -1,6 +1,7 @@
 include ../Makefile.tests_common
 
 LWIP_IPV4 ?= 0
+LWIP_IPV6 ?= 1
 AUX_LOCAL ?= 1
 
 ifneq (0, $(LWIP_IPV4))
@@ -8,9 +9,6 @@ ifneq (0, $(LWIP_IPV4))
   USEMODULE += lwip_arp
   USEMODULE += lwip_ipv4
   CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
-  LWIP_IPV6 ?= 0
-else
-  LWIP_IPV6 ?= 1
 endif
 
 ifneq (0, $(LWIP_IPV6))
diff --git a/tests/lwip_sock_tcp/Makefile b/tests/lwip_sock_tcp/Makefile
index b228a9897d..93544ef344 100644
--- a/tests/lwip_sock_tcp/Makefile
+++ b/tests/lwip_sock_tcp/Makefile
@@ -1,15 +1,13 @@
 include ../Makefile.tests_common
 
 LWIP_IPV4 ?= 0
+LWIP_IPV6 ?= 1
 
 ifneq (0, $(LWIP_IPV4))
   USEMODULE += ipv4_addr
   USEMODULE += lwip_arp
   USEMODULE += lwip_ipv4
   CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
-  LWIP_IPV6 ?= 0
-else
-  LWIP_IPV6 ?= 1
 endif
 
 ifneq (0, $(LWIP_IPV6))
diff --git a/tests/lwip_sock_udp/Makefile b/tests/lwip_sock_udp/Makefile
index 2e95304862..de56d817aa 100644
--- a/tests/lwip_sock_udp/Makefile
+++ b/tests/lwip_sock_udp/Makefile
@@ -1,6 +1,7 @@
 include ../Makefile.tests_common
 
 LWIP_IPV4 ?= 0
+LWIP_IPV6 ?= 1
 AUX_LOCAL ?= 1
 
 ifneq (0, $(LWIP_IPV4))
@@ -8,9 +9,6 @@ ifneq (0, $(LWIP_IPV4))
   USEMODULE += lwip_arp
   USEMODULE += lwip_ipv4
   CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
-  LWIP_IPV6 ?= 0
-else
-  LWIP_IPV6 ?= 1
 endif
 
 ifneq (0, $(LWIP_IPV6))