diff --git a/test/Makefile.am b/test/Makefile.am
index 81aace0..ff693e4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-check_SCRIPTS=run-test.sh run-test-map.sh
+check_SCRIPTS=run-test.sh
 TEST_EXTENSIONS = \
 	.sh \
 	$(NULL)
diff --git a/test/fonts.conf.in b/test/fonts.conf.in
index 24bd58b..12a0b76 100644
--- a/test/fonts.conf.in
+++ b/test/fonts.conf.in
@@ -1,4 +1,5 @@
 <fontconfig>
-<dir @MAP@>@FONTDIR@</dir>
+@REMAPDIR@
+<dir>@FONTDIR@</dir>
 <cachedir>@CACHEDIR@</cachedir>
 </fontconfig>
diff --git a/test/run-test.sh b/test/run-test.sh
index b9a07b8..0183eaf 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -73,7 +73,7 @@ dotest () {
 }
 
 sed "s!@FONTDIR@!$FONTDIR!
-s!@MAP@!!
+s!@REMAPDIR@!!
 s!@CACHEDIR@!$CACHEDIR!" < $TESTDIR/fonts.conf.in > fonts.conf
 
 FONTCONFIG_FILE="$MyPWD"/fonts.conf
@@ -146,11 +146,17 @@ sleep 1
 ls -l $CACHEDIR > out1
 TESTTMPDIR=`mktemp -d /tmp/fontconfig.XXXXXXXX`
 sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
-s!@MAP@!map="'"'"$FONTDIR"'"'"!
+s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
 s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < $TESTDIR/fonts.conf.in > bind-fonts.conf
 $BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE $TESTTMPDIR/build/test/bind-fonts.conf $TESTTMPDIR/build/fc-match/fc-match$EXEEXT -f "%{file}\n" ":foundry=Misc" > xxx
 $BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE $TESTTMPDIR/build/test/bind-fonts.conf $TESTTMPDIR/build/test/test-bz106618$EXEEXT | sort > flist1
 $BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev find $TESTTMPDIR/fonts/ -type f -name '*.pcf' | sort > flist2
+ls -l $CACHEDIR > out2
+if cmp out1 out2 > /dev/null ; then : ; else
+  echo "*** Test failed: $TEST"
+  echo "cache was created/updated."
+  exit 1
+fi
 if [ x`cat xxx` != "x$TESTTMPDIR/fonts/4x6.pcf" ]; then
   echo "*** Test failed: $TEST"
   echo "file property doesn't point to the new place: $TESTTMPDIR/fonts/4x6.pcf"
diff --git a/test/test-d1f48f11.c b/test/test-d1f48f11.c
index a5ecac9..929afd9 100644
--- a/test/test-d1f48f11.c
+++ b/test/test-d1f48f11.c
@@ -268,7 +268,9 @@ main (void)
     }
 
     free (d);
+    FcConfigDestroy (cfg);
     setenv ("FONTCONFIG_SYSROOT", sysroot, 1);
+    cfg = FcConfigCreate ();
     dsa = FcStrBuildFilename (sysroot, da, NULL);
     dsac = FcStrCanonFilename (dsa);
     d = FcConfigRealFilename (cfg, dc);
diff --git a/test/test-issue110.c b/test/test-issue110.c
index 0ab40e3..3794b08 100644
--- a/test/test-issue110.c
+++ b/test/test-issue110.c
@@ -224,7 +224,9 @@ main(void)
 	goto bail;
     free (ret);
     free (s);
+    FcConfigDestroy (cfg);
     setenv ("FONTCONFIG_SYSROOT", sysroot, 1);
+    cfg = FcConfigCreate ();
     fprintf (stderr, "D: Creating %s\n", sysroot);
     mkdir_p (sysroot);
     retval++;