diff --git a/build.xml b/build.xml
index 97bd7bb4f..5eef78c1c 100644
--- a/build.xml
+++ b/build.xml
@@ -1125,6 +1125,14 @@
 		<ant dir="router/java/" target="fullclovertest" />
     </target>
 
+    <target name="testscripts" >
+        <exec executable="tests/scripts/checkcerts.sh" failonerror="true" />
+        <exec executable="tests/scripts/checkpo.sh" failonerror="true" />
+        <exec executable="tests/scripts/checkutf8.sh" failonerror="true" />
+        <exec executable="tests/scripts/checkxml.sh" failonerror="true" />
+    </target>
+
+
     <!-- <target name="syndie" >
         <ant dir="apps/syndie/java/" target="standalone" />
         <copy file="apps/syndie/java/syndie-standalone.zip" todir="." />
@@ -1185,7 +1193,7 @@
 <!--
     <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
 -->
-    <target name="release" depends="distclean, updater, updater200, preppkg, installer, getReleaseNumber" >
+    <target name="release" depends="distclean, testscripts, updater, updater200, preppkg, installer, getReleaseNumber" >
         <echo message="================================================================" />
         <echo message="Did you update these files?" />
         <exec executable="ls" failonerror="true">
diff --git a/history.txt b/history.txt
index 6837ffca3..47d1c27a7 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,5 @@
 2011-09-12 zzz
+  * build.xml: Run test scripts at release time
   * Build Executor:
     - Limit max parallel builds on really slow machines (ticket #519)
     - Slow down build loop when network is apparently disconnected (ticket #519)
diff --git a/tests/scripts/checkxml.sh b/tests/scripts/checkxml.sh
index d6524476d..dbcac0b15 100755
--- a/tests/scripts/checkxml.sh
+++ b/tests/scripts/checkxml.sh
@@ -11,10 +11,6 @@
 cd `dirname $0`/../..
 
 XMLFILES="\
-./android/AndroidManifest.xml \
-./android/build.xml \
-./android/res/layout/main.xml \
-./android/res/values/strings.xml \
 ./apps/addressbook/build.xml \
 ./apps/addressbook/web.xml \
 ./apps/BOB/build.xml \