diff --git a/tests/local-tests/Makefile b/tests/local-tests/Makefile
index d6ab7a3..8781b42 100644
--- a/tests/local-tests/Makefile
+++ b/tests/local-tests/Makefile
@@ -3,4 +3,5 @@
 
 APP_NAME := local-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock
-include ../../../EpoxyDuino/EpoxyDuino.mk
+ESP_LIBS = ESP8266WiFi
+include ../../../EspMock/EspMock.mk
diff --git a/tests/local-tests/local-tests.ino b/tests/local-tests/local-tests.ino
index 73883f4..97f7cbe 100644
--- a/tests/local-tests/local-tests.ino
+++ b/tests/local-tests/local-tests.ino
@@ -6,7 +6,7 @@
 	* TinyMqtt local unit tests.
 	*
 	* Clients are connected to pseudo remote broker
-	* The remote will be 127.0.0.1:1883
+	* The remote should be 127.0.0.1:1883 <--- But this does not work due to Esp network limitations
 	* We are using 127.0.0.1 because this is simpler to test with a single ESP
 	* Also, this will allow to mock and thus run Action on github
 	**/
diff --git a/tests/nowifi-tests/Makefile b/tests/nowifi-tests/Makefile
index 092a2d4..3733f64 100644
--- a/tests/nowifi-tests/Makefile
+++ b/tests/nowifi-tests/Makefile
@@ -3,4 +3,5 @@
 
 APP_NAME := nowifi-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock
-include ../../../EpoxyDuino/EpoxyDuino.mk
+ESP_LIBS = ESP8266WiFi
+include ../../../EspMock/EspMock.mk
diff --git a/tests/string-indexer-tests/Makefile b/tests/string-indexer-tests/Makefile
index a118875..acb264f 100644
--- a/tests/string-indexer-tests/Makefile
+++ b/tests/string-indexer-tests/Makefile
@@ -3,4 +3,5 @@
 
 APP_NAME := string-indexer-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock
-include ../../../EpoxyDuino/EpoxyDuino.mk
+ESP_LIBS = ESP8266WiFi
+include ../../../EspMock/EspMock.mk