diff --git a/test/Makefile b/test/Makefile
index 94e9daeb..b4e4a691 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -200,11 +200,12 @@ vc22: Makefile mongoose.h $(SRCS)
 	$(DOCKER) mdashnet/vc22 wine64 $@.exe
 
 mingw: Makefile mongoose.h $(SRCS)
-	$(DOCKER) mdashnet/mingw x86_64-w64-mingw32-gcc $(SRCS) -W -Wall -Werror -I. $(DEFS) -lwsock32 -lbcrypt -o $@.exe
+	$(DOCKER) mdashnet/mingw x86_64-w64-mingw32-gcc $(SRCS) -W -Wall -Werror -I. $(DEFS) $(TFLAGS) -lwsock32 -lbcrypt -o $@.exe
 	$(DOCKER) mdashnet/mingw wine64 $@.exe
 
 mingw++: Makefile mongoose.h $(SRCS)
-	$(DOCKER) mdashnet/mingw x86_64-w64-mingw32-g++ $(SRCS) -W -Wall -Werror -I. $(DEFS) -lwsock32 -lbcrypt -o $@.exe
+	$(DOCKER) mdashnet/mingw x86_64-w64-mingw32-g++ $(SRCS) -W -Wall -Werror -I. $(DEFS) $(TFLAGS) -lwsock32 -lbcrypt -o $@.exe
+	@echo "NOT RUNNING"
 
 linux-libs: CFLAGS += -fPIC
 linux-libs: LDFLAGS += -Wl,-soname,libmongoose.so.$(VERSION)
diff --git a/test/setup_mqtt_server.sh b/test/setup_mqtt_server.sh
index d38e93a6..d784b947 100755
--- a/test/setup_mqtt_server.sh
+++ b/test/setup_mqtt_server.sh
@@ -3,7 +3,7 @@
 sudo apt-get -y install mosquitto
 sudo cp test/mosquitto.conf /etc/mosquitto/conf.d/
 sudo cp test/certs/ca.crt /etc/mosquitto/certs/
-sudo cp test/certs/serverc.crt /etc/mosquitto/certs/
-sudo cp test/certs/serverc.key /etc/mosquitto/certs/
+sudo cp test/certs/server.crt /etc/mosquitto/certs/
+sudo cp test/certs/server.key /etc/mosquitto/certs/
 sudo chmod a+w /var/log/mosquitto/*
 sudo mosquitto -c /etc/mosquitto/mosquitto.conf &