diff --git a/tests/host/Makefile b/tests/host/Makefile
index c83c55fde3..bc520ce036 100644
--- a/tests/host/Makefile
+++ b/tests/host/Makefile
@@ -120,8 +120,10 @@ DEBUG += -DDEBUG_ESP_PORT=Serial
 DEBUG += -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_MDNS
 endif
 
-CXXFLAGS += $(DEBUG) -std=c++11 -Wall -Werror -coverage $(OPTZ) -fno-common -g $(M32)
-CFLAGS += -std=c99 -Wall -Werror -coverage $(OPTZ) -fno-common -g $(M32)
+FLAGS += $(DEBUG) -Wall -Werror -coverage $(OPTZ) -fno-common -g $(M32)
+FLAGS += -DLWIP_IPV6=0
+CXXFLAGS += -std=c++11 $(FLAGS)
+CFLAGS += -std=c99 $(FLAGS)
 LDFLAGS += -coverage $(OPTZ) -g $(M32)
 VALGRINDFLAGS += --leak-check=full --track-origins=yes --error-limit=no --show-leak-kinds=all --error-exitcode=999
 CXXFLAGS += -Wno-error=format-security # cores/esp8266/Print.cpp:42:24:   error: format not a string literal and no format arguments [-Werror=format-security] -- (os_printf_plus(not_the_best_way))
diff --git a/tests/host/common/MockWiFiServer.cpp b/tests/host/common/MockWiFiServer.cpp
index 5a03f8d87d..1b5ef62604 100644
--- a/tests/host/common/MockWiFiServer.cpp
+++ b/tests/host/common/MockWiFiServer.cpp
@@ -44,7 +44,7 @@ extern "C" const ip_addr_t ip_addr_any = IPADDR4_INIT(IPADDR_ANY);
 
 // lwIP API side of WiFiServer
 
-WiFiServer::WiFiServer (IPAddress addr, uint16_t port)
+WiFiServer::WiFiServer (const IPAddress& addr, uint16_t port)
 {
 	(void)addr;
 	if (port < 1024)
diff --git a/tests/host/common/include/ClientContext.h b/tests/host/common/include/ClientContext.h
index ee88258431..8db6c1df0d 100644
--- a/tests/host/common/include/ClientContext.h
+++ b/tests/host/common/include/ClientContext.h
@@ -98,7 +98,7 @@ class ClientContext
         }
     }
 
-    int connect(ip_addr_t* addr, uint16_t port)
+    int connect(const ip_addr_t* addr, uint16_t port)
     {
         return mockConnect(addr->addr, _sock, port);
     }
diff --git a/tests/host/common/include/UdpContext.h b/tests/host/common/include/UdpContext.h
index 3ea6f3c67f..4696ab7f77 100644
--- a/tests/host/common/include/UdpContext.h
+++ b/tests/host/common/include/UdpContext.h
@@ -55,16 +55,16 @@ class UdpContext
         }
     }
 
-    bool connect (ip_addr_t addr, uint16_t port)
+    bool connect (const ip_addr_t* addr, uint16_t port)
     {
-        _dst = addr;
+        _dst = *addr;
         _dstport = port;
         return true;
     }
 
-    bool listen(ip_addr_t addr, uint16_t port)
+    bool listen(const ip_addr_t* addr, uint16_t port)
     {
-        bool ret = mockUDPListen(_sock, addr.addr, port, staticMCastAddr);
+        bool ret = mockUDPListen(_sock, addr->addr, port, staticMCastAddr);
         register_udp(_sock, this);
         return ret;
     }