diff --git a/expat/lib/internal.h b/expat/lib/internal.h
index 167ec3680..f5b5a04d9 100644
--- a/expat/lib/internal.h
+++ b/expat/lib/internal.h
@@ -164,7 +164,7 @@ const char *unsignedCharToPrintable(unsigned char c);
 
 extern
 #if ! defined(XML_TESTING)
-    const
+    //const
 #endif
     XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c
 #if defined(XML_TESTING)
diff --git a/expat/tests/basic_tests.c b/expat/tests/basic_tests.c
index 2892bab88..f95d6f988 100644
--- a/expat/tests/basic_tests.c
+++ b/expat/tests/basic_tests.c
@@ -45,6 +45,8 @@
 #  undef NDEBUG /* because test suite relies on assert(...) at the moment */
 #endif
 
+#define XML_TESTING 1
+
 #include <assert.h>
 
 #include <stdio.h>
@@ -3206,7 +3208,7 @@ static int XMLCALL
 external_bom_checker(XML_Parser parser, const XML_Char *context,
                      const XML_Char *base, const XML_Char *systemId,
                      const XML_Char *publicId) {
-  const char *text;
+  const char *text = NULL;
   UNUSED_P(base);
   UNUSED_P(systemId);
   UNUSED_P(publicId);
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 83a48a454..0b769c8e0 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -42,6 +42,8 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define XML_TESTING 1
+
 #include "expat_config.h"
 
 #include <stdio.h>
@@ -91,7 +93,7 @@ main(int argc, const char** argv) {
   SRunner *sr = srunner_create(s);
 
   for (i = 1; i < argc; ++i) {
-    char *opt = argv[i];
+    const char *opt = argv[i];
     if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0)
       verbosity = CK_VERBOSE;
     else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0)