diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk
index 791532f8c002..00ebfda8844a 100644
--- a/sw/qa/core/makefile.mk
+++ b/sw/qa/core/makefile.mk
@@ -37,9 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:testjob by codegen.pl