diff --git a/.github/workflows/aunit.yml b/.github/workflows/aunit.yml
index a23ac7f..7bcea12 100644
--- a/.github/workflows/aunit.yml
+++ b/.github/workflows/aunit.yml
@@ -24,5 +24,11 @@ jobs:
         git clone https://github.com/hsaturn/EspMock
     - name: Verify tests
       run: |
-        make -C tests
+        # Run tests for ESP8266
+        make -C tests ESP_LIBS="ESP8266WiFi ESPAsyncTCP" tests
         make -C tests runtests
+	make -C tests clean
+        # Run tests for ESP32
+        #make -C tests ESP_LIBS="ESP8266WiFi ESPAsyncTCP" tests
+        #make -C tests runtests
+	#make -C tests clean
diff --git a/tests/local-tests/Makefile b/tests/local-tests/Makefile
index 232112d..08515f4 100644
--- a/tests/local-tests/Makefile
+++ b/tests/local-tests/Makefile
@@ -3,5 +3,4 @@
 
 APP_NAME := local-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock
-ESP_LIBS = ESP8266WiFi ESPAsyncTCP
 include ../../../EspMock/EspMock.mk
diff --git a/tests/nowifi-tests/Makefile b/tests/nowifi-tests/Makefile
index b5913b1..5b1d53a 100644
--- a/tests/nowifi-tests/Makefile
+++ b/tests/nowifi-tests/Makefile
@@ -3,5 +3,4 @@
 
 APP_NAME := nowifi-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock
-ESP_LIBS = ESP8266WiFi ESPAsyncTCP
 include ../../../EspMock/EspMock.mk
diff --git a/tests/string-indexer-tests/Makefile b/tests/string-indexer-tests/Makefile
index 9673cca..77befb8 100644
--- a/tests/string-indexer-tests/Makefile
+++ b/tests/string-indexer-tests/Makefile
@@ -3,5 +3,4 @@
 
 APP_NAME := string-indexer-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock
-ESP_LIBS = ESP8266WiFi ESPAsyncTCP
 include ../../../EspMock/EspMock.mk