diff --git a/test/cgt+make/Makefile b/test/cgt+make/Makefile
new file mode 100644
index 0000000000..f7f3b8e531
--- /dev/null
+++ b/test/cgt+make/Makefile
@@ -0,0 +1,12 @@
+ROOT ?= $(realpath $(CURDIR)/../..)
+TARGET ?= Debug
+DOCKER = docker run --rm -v $(ROOT):$(ROOT) -v $(CURDIR):/root -w $(CURDIR) 
+IMAGE ?= scaprile/cgt
+
+all: $(PROJECTS)
+	echo
+
+$(PROJECTS): FORCE
+	$(DOCKER) $(IMAGE) make -C $@
+
+FORCE:
diff --git a/test/cube/Makefile b/test/cube/Makefile
index e9f7935eac..3cd264c90d 100644
--- a/test/cube/Makefile
+++ b/test/cube/Makefile
@@ -10,7 +10,15 @@ all: $(PROJECTS)
 
 $(PROJECTS): FORCE
 	(make -C $@ && make -C $@ clean) || ( \
-	PROJNAME=`xq -r .projectDescription.name $@/.project` && \
-	$(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -import $@ -cleanBuild $$PROJNAME/$(TARGET) )
+	COREDIRS=`find $@ -maxdepth 1 -name 'CM*' -print` && ( \
+	(test "$$COREDIRS" == "" && \
+	  PROJNAME=`xq -r .projectDescription.name $@/.project` && \
+	  $(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -import $@ -cleanBuild $$PROJNAME/$(TARGET) ) || ( \
+	(test "$$COREDIRS" != "" && \
+	  for core in $$COREDIRS; do \
+	    DIR=`basename $$core` \
+	    PROJNAME=`xq -r .projectDescription.name $@/$$DIR/.project` && \
+	    $(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -import $@/$$DIR -cleanBuild $$PROJNAME/$(TARGET) || exit 1; \
+	  done ))))
 
 FORCE:
diff --git a/test/wizard/Makefile b/test/wizard/Makefile
index 12d0bf1507..c3a86f88d1 100644
--- a/test/wizard/Makefile
+++ b/test/wizard/Makefile
@@ -6,13 +6,10 @@ ifeq "$(IDE)" "GCC+make"
 BUILD = $(MAKE) -f ../gcc+make/Makefile PROJECTS=wizard
 endif
 ifeq "$(IDE)" "CubeIDE"
-BUILD = $(MAKE) -f ../cube/Makefile PROJECTS=wizard
+BUILD = $(MAKE) -f ../cube/Makefile PROJECTS=wizard && rm -rf workspace
 endif
 ifeq "$(IDE)" "MCUXpresso"
-BUILD = $(MAKE) -f ../xpresso/Makefile PROJECTS=wizard
-endif
-ifeq "$(IDE)" "Zephyr"
-BUILD = true
+BUILD = $(MAKE) -f ../xpresso/Makefile PROJECTS=wizard && rm -rf workspace
 endif
 ifeq "$(IDE)" "Keil"
 BUILD = true
@@ -26,6 +23,12 @@ endif
 ifeq "$(IDE)" "Arduino"
 BUILD = true
 endif
+ifeq "$(IDE)" "CGT+make"
+BUILD = $(MAKE) -f ../cgt+make/Makefile PROJECTS=wizard
+endif
+ifeq "$(IDE)" "Zephyr"
+BUILD = $(MAKE) -f ../zephyr/Makefile PROJECTS=wizard BOARD=$(BOARD)
+endif
 
 
 firmware.bin: wizard
diff --git a/test/wizard/test.sh b/test/wizard/test.sh
index 6789000c3c..bd81a90f5e 100755
--- a/test/wizard/test.sh
+++ b/test/wizard/test.sh
@@ -17,7 +17,6 @@ rm test.log
 
 STM32="f207 f429 f439 f746 f756 f767 h563 h573 h723 h735 h743 h745 h747 h753 h755"
 STIDES="GCC+make CubeIDE"
-# Zephyr: !f439
 # Keil: f756
 for board in $STM32; do
 	for ide in $STIDES; do
@@ -28,16 +27,19 @@ for board in $STM32; do
 done
 
 
-NXP="rt1020 rt1024 rt1040 rt1060 rt1064 rt1170 mcxn947"
-NXPIDES="GCC+make"
-#MCUXpresso: mcxn947
+NXP="mcxn947"
+NXPIDES="GCC+make MCUXpresso"
 for board in $NXP; do
 	for ide in $NXPIDES; do
-		for rtos in "baremetal"; do
+		for rtos in $RTOSES; do
 			dotest $board $ide $rtos
 		done
 	done
 done
+NXP="rt1020 rt1024 rt1040 rt1060 rt1064 rt1170"
+for board in $NXP; do
+	dotest $board "GCC+make" "baremetal"
+done
 
 
 INFINEON="xmc4400 xmc4700 xmc7200"
@@ -51,8 +53,19 @@ for board in $INFINEON; do
 done
 
 
+TI="tm4c129"
+TIIDES="GCC+make"
+for board in $TI; do
+	for ide in $TIIDES; do
+		for rtos in $RTOSES; do
+			dotest $board $ide $rtos
+		done
+	done
+done
+dotest "tms570" "CGT+make" "baremetal"
+
+
 PICO="evb-pico"
-#Zephyr
 for board in $PICO; do
 	for rtos in "baremetal"; do
 		dotest $board "Pico-SDK" $rtos
@@ -66,6 +79,12 @@ for board in $ESP; do
 done
 
 
+ZEPHYR="f207 f429 f746 f756 f767 h563 h573 h723 h735 h743 h745 h747 h753 h755 mcxn947 rt1060 rt1064 evb-pico"
+for board in $ZEPHYR; do
+	echo dotest $board "Zephyr" "baremetal"
+done
+
+
 ARDUINO="teensy41"
 
 rm -rf workspace pico-sdk