diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index cbcdbb88078c..985eef85357b 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -98,6 +98,7 @@ common
         ENABLE_NAS
 		ENABLE_PCH
 		SYSTEM_CURL
+        SYSTEM_CPPUNIT
         SYSTEM_FREETYPE
         FREETYPE_CFLAGS
         FREETYPE_LIBS
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 773dafc623fb..1d4c1d50422f 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1347,6 +1347,10 @@ $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/x
 XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
 XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
 
+.IF "$(SYSTEM_CPPUNIT)" != "YES"
+CPPUNIT_CFLAGS =
+.END
+
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
 # as an escaped "#". if it was an assignment, escaping works...