diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
index a31f7b03..6d8f98c1 100644
--- a/apache2/mod_security2.c
+++ b/apache2/mod_security2.c
@@ -51,8 +51,6 @@ apr_file_t DSOLOCAL *guardianlog_fd = NULL;
 
 char DSOLOCAL *guardianlog_condition = NULL;
 
-unsigned long int DSOLOCAL unicode_codepage = 0;
-
 unsigned long int DSOLOCAL msc_pcre_match_limit = 0;
 
 unsigned long int DSOLOCAL msc_pcre_match_limit_recursion = 0;
@@ -61,8 +59,6 @@ unsigned long int DSOLOCAL conn_read_state_limit = 0;
 
 unsigned long int DSOLOCAL conn_write_state_limit = 0;
 
-int DSOLOCAL *unicode_map_table = NULL;
-
 static int server_limit, thread_limit;
 
 typedef struct {
diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c
index c1db0f9b..d06ca3cc 100644
--- a/apache2/modsecurity.c
+++ b/apache2/modsecurity.c
@@ -22,6 +22,10 @@
 #include "msc_xml.h"
 #include "apr_version.h"
 
+unsigned long int DSOLOCAL unicode_codepage = 0;
+
+int DSOLOCAL *unicode_map_table = NULL;
+
 /**
  * Format an alert message.
  */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a32fbc07..7339f5ad 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,6 +12,7 @@ msc_test_SOURCES = msc_test.c \
                    $(top_srcdir)/apache2/msc_parsers.c \
                    $(top_srcdir)/apache2/msc_util.c \
                    $(top_srcdir)/apache2/msc_pcre.c \
+                   $(top_srcdir)/apache2/msc_unicode.c \
                    $(top_srcdir)/apache2/persist_dbm.c \
                    $(top_srcdir)/apache2/msc_reqbody.c \
                    $(top_srcdir)/apache2/msc_geo.c \
@@ -20,7 +21,7 @@ msc_test_SOURCES = msc_test.c \
                    $(top_srcdir)/apache2/msc_lua.c \
                    $(top_srcdir)/apache2/msc_release.c
 msc_test_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-                  @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@
+                  @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @LUA_CFLAGS@
 msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
                     @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ \
                     @PCRE_CPPFLAGS@