diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 19a4a1143..ee20520d8 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -44,6 +44,8 @@ TESTS =						\
 	test_pknistkdf				\
 	test_time
 
+check_DATA = test_config_strings.out
+
 check_PROGRAMS = $(TESTS) test_hostname test_ap-req
 
 LDADD = libkrb5.la \
@@ -338,6 +340,7 @@ build_HEADERZ = \
 	krb_err.h
 
 CLEANFILES = \
+	test_config_strings.out \
 	test-store-data \
 	krb5_err.c krb5_err.h \
 	krb_err.c krb_err.h \
@@ -346,6 +349,9 @@ CLEANFILES = \
 
 $(libkrb5_la_OBJECTS): krb5_err.h krb_err.h heim_err.h k524_err.h crypto.h
 
+test_config_strings.out: test_config_strings.cfg
+	$(CP) $(srcdir)/test_config_strings.cfg test_config_strings.out
+
 EXTRA_DIST = \
 	krb5_err.et \
 	krb_err.et \
@@ -353,6 +359,7 @@ EXTRA_DIST = \
 	k524_err.et \
 	$(man_MANS) \
 	version-script.map \
+	test_config_strings.cfg \
 	krb5.moduli
 
 #sysconf_DATA = krb5.moduli
diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile
index f5fd6aa5b..e22d0f67b 100644
--- a/lib/krb5/NTMakefile
+++ b/lib/krb5/NTMakefile
@@ -436,9 +436,9 @@ test_binaries =				\
 
 test-binaries: $(test_binaries)
 
-test-files: $(OBJ)\test_config_strings.cfg
+test-files: $(OBJ)\test_config_strings.out
 
-$(OBJ)\test_config_strings.cfg: test_config_strings.cfg
+$(OBJ)\test_config_strings.out: test_config_strings.cfg
 	$(CP) $** $@
 
 test-run:
diff --git a/lib/krb5/test_config.c b/lib/krb5/test_config.c
index 7caa43c1b..7e83c6e59 100644
--- a/lib/krb5/test_config.c
+++ b/lib/krb5/test_config.c
@@ -96,7 +96,7 @@ struct {
     { "", NULL }
 };
 
-void
+static void
 check_config_files(void)
 {
     krb5_context context;
@@ -186,7 +186,7 @@ const struct {
     { "longer_strings", config_string_result10 }
 };
 
-void
+static void
 check_escaped_strings(void)
 {
     krb5_context context;
@@ -198,7 +198,7 @@ check_escaped_strings(void)
     if (ret)
         errx(1, "krb5_init_context %d", ret);
 
-    ret = krb5_config_parse_file(context, "test_config_strings.cfg", &c);
+    ret = krb5_config_parse_file(context, "test_config_strings.out", &c);
     if (ret)
         krb5_errx(context, 1, "krb5_config_parse_file()");
 
@@ -214,7 +214,7 @@ check_escaped_strings(void)
 
         e = config_strings_tests[i].expected;
 
-        for (s = ps; *s && *e; s++, e++) {
+        for (s = (const char **)ps; *s && *e; s++, e++) {
             if (strcmp(*s, *e))
                 errx(1,
                      "Unexpected configuration string at value [%s].\n"