--- cpp/Makefile.orig	2015-06-23 15:30:20.000000000 +0000
+++ cpp/Makefile	2015-06-27 09:35:22.892599446 +0000
@@ -13,8 +13,8 @@
 
 SUBDIRS		= config src include
 
-ifneq ($(MAKECMDGOALS),install)
-    SUBDIRS		:= $(SUBDIRS) test
+ifeq ($(NOTESTS),)
+	SUBDIRS		:= $(SUBDIRS) test
 endif
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \