diff --git a/tests/scripts/checkutf8.sh b/tests/scripts/checkutf8.sh
index 04694f1c20aadf49422f8e29619e9feb8b3acbbd..ccd50472867c6f45b52dab09e0e150d2aa930122 100755
--- a/tests/scripts/checkutf8.sh
+++ b/tests/scripts/checkutf8.sh
@@ -19,7 +19,7 @@ DIRS="\
   apps/susimail/locale \
   apps/desktopgui/locale \
   debian/po \
-  installer/resources/eepsite.help/help \
+  installer/resources/eepsite/docroot/help \
   installer/resources/initialNews \
   installer/resources/proxy \
   installer/resources/readme \
diff --git a/tests/scripts/checkxml.sh b/tests/scripts/checkxml.sh
index dbcac0b15d7b2945163860c4119e58b028e3881d..56b263a52abe7e2e8d789ae52ddf1f96473d55aa 100755
--- a/tests/scripts/checkxml.sh
+++ b/tests/scripts/checkxml.sh
@@ -49,7 +49,13 @@ XMLFILES="\
 ./installer/i2pstandalone.xml \
 ./installer/install.xml \
 ./installer/lib/launch4j/build.xml \
-./installer/resources/jetty.xml \
+./installer/resources/eepsite/jetty-ssl.xml
+./installer/resources/eepsite/contexts/cgi-context.xml
+./installer/resources/eepsite/contexts/base-context.xml
+./installer/resources/eepsite/jetty-rewrite.xml
+./installer/resources/eepsite/etc/webdefault.xml
+./installer/resources/eepsite/jetty-jmx.xml
+./installer/resources/eepsite/jetty.xml
 ./installer/resources/shortcutSpec.xml \
 ./router/java/build.xml \
 ./Slackware/i2p-base/build.xml \
@@ -61,7 +67,6 @@ HTMLFILES="\
 ./apps/BOB/src/net/i2p/BOB/package.html \
 ./apps/desktopgui/src/net/i2p/desktopgui/package.html \
 ./apps/ministreaming/java/src/net/i2p/client/streaming/package.html \
-./apps/routerconsole/jsp/i2psnark/index.html \
 ./apps/susidns/src/index.html \
 ./apps/susimail/src/index.html \
 ./core/java/src/net/i2p/client/datagram/package.html \
@@ -75,15 +80,15 @@ HTMLFILES="\
 ./core/java/src/net/i2p/stat/package.html \
 ./core/java/src/net/i2p/time/package.html \
 ./core/java/src/net/i2p/util/package.html \
-./installer/resources/eepsite.help/help/index_de.html \
-./installer/resources/eepsite.help/help/index_fr.html \
-./installer/resources/eepsite.help/help/index.html \
-./installer/resources/eepsite.help/help/index_na.html \
-./installer/resources/eepsite.help/help/index_nl.html \
-./installer/resources/eepsite.help/help/index_ru.html \
-./installer/resources/eepsite.help/help/index_sv.html \
-./installer/resources/eepsite.help/help/pagetemplate.html \
-./installer/resources/eepsite.help/index.html \
+./installer/resources/eepsite/docroot/help/index_de.html \
+./installer/resources/eepsite/docroot/help/index_fr.html \
+./installer/resources/eepsite/docroot/help/index.html \
+./installer/resources/eepsite/docroot/help/index_na.html \
+./installer/resources/eepsite/docroot/help/index_nl.html \
+./installer/resources/eepsite/docroot/help/index_ru.html \
+./installer/resources/eepsite/docroot/help/index_sv.html \
+./installer/resources/eepsite/docroot/help/pagetemplate.html \
+./installer/resources/eepsite/docroot/index.html \
 ./installer/resources/readme/readme_ar.html \
 ./installer/resources/readme/readme_de.html \
 ./installer/resources/readme/readme_es.html \