diff --git a/src/rrdExecuteScript.c b/src/rrdExecuteScript.c
index d3e0722b7..151941036 100644
--- a/src/rrdExecuteScript.c
+++ b/src/rrdExecuteScript.c
@@ -23,7 +23,9 @@
 #else
 #define RRD_SCRIPT "./mockSampleUploadScript.sh"
 #endif
+#if !defined(GTEST_ENABLE)
 #include "secure_wrapper.h"
+#endif
 
 static void normalizeIssueName(char *str);
 
diff --git a/src/rrdRunCmdThread.c b/src/rrdRunCmdThread.c
index 63cf27ae8..e8de08c29 100644
--- a/src/rrdRunCmdThread.c
+++ b/src/rrdRunCmdThread.c
@@ -24,7 +24,9 @@
 #include <sys/stat.h>
 #include "rrdRunCmdThread.h"
 #include "rrdCommandSanity.h"
+#if !defined(GTEST_ENABLE)
 #include "secure_wrapper.h"
+#endif
 
 pthread_mutex_t rrdCacheMut;
 static cacheData *cacheDataNode = NULL;
diff --git a/src/unittest/Makefile.am b/src/unittest/Makefile.am
index e92e103c4..9c8e0107c 100644
--- a/src/unittest/Makefile.am
+++ b/src/unittest/Makefile.am
@@ -22,7 +22,7 @@ bin_PROGRAMS = remotedebugger_gtest
 COMMON_CPPFLAGS = -I../ -I../../ -I./mocks -I/usr/include/cjson -I/usr/include/nettle -I/usr/include/msgpack -DGTEST_ENABLE
 
 # Define the libraries to link against
-COMMON_LDADD = -lgtest -lgtest_main -lgmock_main -lgmock -lcjson -lmsgpackc -lgcov -lsecure_wrapper
+COMMON_LDADD = -lgtest -lgtest_main -lgmock_main -lgmock -lcjson -lmsgpackc -lgcov
 
 # Define the compiler flags
 COMMON_CXXFLAGS = -frtti -fprofile-arcs -ftest-coverage