diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c
index 6e37d57b..5ac9ad8e 100644
--- a/apache2/modsecurity.c
+++ b/apache2/modsecurity.c
@@ -125,6 +125,7 @@ int modsecurity_init(msc_engine *msce, apr_pool_t *mp) {
         return -1;
     }
 
+#if !defined(MSC_TEST)
 #ifdef __SET_MUTEX_PERMS
 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
     rc = ap_unixd_set_global_mutex_perms(msce->auditlog_lock);
@@ -153,7 +154,7 @@ int modsecurity_init(msc_engine *msce, apr_pool_t *mp) {
         return -1;
     }
 #endif /* SET_MUTEX_PERMS */
-
+#endif
 
     return 1;
 }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7339f5ad..6668bd2d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,7 @@ msc_test_SOURCES = msc_test.c \
                    $(top_srcdir)/apache2/msc_unicode.c \
                    $(top_srcdir)/apache2/persist_dbm.c \
                    $(top_srcdir)/apache2/msc_reqbody.c \
+                   $(top_srcdir)/apache2/msc_crypt.c \
                    $(top_srcdir)/apache2/msc_geo.c \
                    $(top_srcdir)/apache2/msc_gsb.c \
                    $(top_srcdir)/apache2/acmp.c \