diff --git a/tests/Makefile.am b/tests/Makefile.am
index bfda0cff97..40785926f9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -223,7 +223,7 @@ cppunittest_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CP
 ###cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\""
 cppunittest_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS)
 cppunittest_LDADD   = $(top_builddir)/clients/libnutclientstub.la
-cppunittest_LDADD  += $(top_builddir)/clients/libnutclient.la
+#cppunittest_LDADD += $(top_builddir)/clients/libnutclient.la
 cppunittest_SOURCES = $(CPPUNITTESTSRC) $(CPPUNITTESTERSRC)
 
 # Currently nutconf and related codebase causes woes for static analysis
@@ -241,7 +241,7 @@ endif WITH_SSL_CXX
 cppnit_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
 cppnit_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS)
 cppnit_LDADD   = $(top_builddir)/clients/libnutclientstub.la
-cppnit_LDADD  += $(top_builddir)/clients/libnutclient.la
+#cppnit_LDADD += $(top_builddir)/clients/libnutclient.la
 cppnit_SOURCES = $(CPPCLIENTTESTSRC) $(CPPUNITTESTERSRC)
 if WITH_SSL_CXX
 cppnit_LDADD += $(LIBSSL_LIBS)