diff --git a/tests/Makefile b/tests/Makefile
index eaa726c..87b61dd 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,6 @@
 tests:
 	@set -e; \
-	for i in *-tests/Makefile; do \
+	for i in $(SUB)*-tests/Makefile; do \
 		$(MAKE) -C $$(dirname $$i) -j clean; \
 		echo '==== Making:' $$(dirname $$i); \
 		$(MAKE) -C $$(dirname $$i) -j; \
@@ -16,14 +16,14 @@ runtests: debugtest
 	@$(MAKE) clean
 	@$(MAKE) tests
 	@set -e; \
-	for i in *-tests/Makefile; do \
+	for i in $(SUB)*-tests/Makefile; do \
 		echo '==== Running:' $$(dirname $$i); \
 		$$(dirname $$i)/$$(dirname $$i).out; \
 	done
 
 clean:
 	@set -e; \
-	for i in *-tests/Makefile; do \
+	for i in $(SUB)*-tests/Makefile; do \
 		echo '==== Cleaning:' $$(dirname $$i); \
 		$(MAKE) -C $$(dirname $$i) clean; \
 	done
diff --git a/tests/classbind-tests/Makefile b/tests/classbind-tests/Makefile
index 7f0f8b5..02535c3 100644
--- a/tests/classbind-tests/Makefile
+++ b/tests/classbind-tests/Makefile
@@ -3,9 +3,6 @@
 
 EXTRA_CXXFLAGS=-g3 -O0 -DTINY_MQTT_TESTS
 
-# Remove flto flag from EpoxyDuino (too many <optimized out>)
-CXXFLAGS = -Wextra -Wall -std=gnu++11 -fno-exceptions -fno-threadsafe-statics
-
 APP_NAME := classbind-tests
 ARDUINO_LIBS := AUnit AceCommon AceTime TinyMqtt EspMock ESP8266WiFi  ESPAsyncTCP TinyConsole
 ARDUINO_LIB_DIRS := ../../../EspMock/libraries