diff --git a/build.xml b/build.xml
index 961ca4d41e314bacd6f2cbc3a18ea6d6cb9b26db..f6d637a5fa4a455da235a4404500269e4086f176 100644
--- a/build.xml
+++ b/build.xml
@@ -7,6 +7,8 @@
   <property name="apacheconfdir" value="/etc/apache2/conf.d" />
   <property name="apachectl" value="false" /><!-- set to apachectl path to spin up Apache instance -->
   <property name="nodepath" value="" /><!-- set to node.js modules path to use Zombie.js testing -->
+  <!-- command for extra cleanup during shutdown; e.g. to change cache ownership after testing w/ Apache so deletion won't fail: -->
+  <property name="extra_shutdown_cleanup" value="false" />
   <property name="vufindurl" value="http://localhost/vufind" />
   <property name="vufinddb" value="vufind_test" />
   <property name="vufinddbuser" value="vufindtest" />
@@ -190,6 +192,14 @@
     <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local JETTY_PID=${srcdir}/local/vufindtest.pid ${srcdir}/vufind.sh stop" outputProperty="LASTOUTPUT" />
     <echo message="${LASTOUTPUT}" />
 
+    <!-- run extra cleanup action, if any -->
+    <if>
+      <istrue value="${extra_shutdown_cleanup}" />
+      <then>
+        <exec command="VUFIND_HOME=${srcdir} VUFIND_LOCAL_DIR=${srcdir}/local ${extra_shutdown_cleanup}" />
+      </then>
+    </if>
+
     <!-- delete the configuration, sample index, logs and cache data -->
     <delete dir="${srcdir}/solr/alphabetical_browse" includeemptydirs="true" failonerror="true" />
     <delete dir="${srcdir}/solr/authority/index" includeemptydirs="true" failonerror="true" />