diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk
index e6e7a39d3bae..020015da3aa3 100644
--- a/cppcanvas/CppunitTest_cppcanvas_test.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_test.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_ure,cppcanvas_test))
 $(eval $(call gb_CppunitTest_use_vcl,cppcanvas_test))
 
 $(eval $(call gb_CppunitTest_use_components,cppcanvas_test,\
-	canvas/source/cairo/cairocanvas \
+	$(if $(ENABLE_CAIRO_CANVAS),canvas/source/cairo/cairocanvas) \
 	canvas/source/factory/canvasfactory \
     configmgr/source/configmgr \
     i18npool/util/i18npool \
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index b341bc00d60b..2522c0a02007 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_Module_add_targets,cppcanvas,\
 ))
 
 # FIXME: should generalize these ...
-ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
 $(eval $(call gb_Module_add_check_targets,cppcanvas,\
     CppunitTest_cppcanvas_test \
 ))
 
+ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
 ifneq ($(DISPLAY),)
 $(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
     CppunitTest_cppcanvas_emfplus \
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index ff3fc215f224..1ad9139641a8 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_cairo_canvas.h>
+
 #include <sal/config.h>
 
 #include <test/bootstrapfixture.hxx>
@@ -28,7 +30,7 @@ public:
 
 CPPUNIT_TEST_FIXTURE(CanvasTest, testComposite)
 {
-#ifdef LINUX
+#if ENABLE_CAIRO_CANVAS
     ScopedVclPtrInstance<WorkWindow> pWin( nullptr, WB_STDWORK );
 
     uno::Reference<rendering::XCanvas> xCanvas = pWin->GetOutDev()->GetCanvas ();