diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 35bc8a8..d5bc489 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -17,7 +17,11 @@
 # under the License.
 #
 
-SUBDIRS = . test
+SUBDIRS = .
+
+if WITH_TESTS
+SUBDIRS += test
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig