diff --git a/.cvsignore b/.cvsignore
index b42632e..79be451 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,6 +2,7 @@
 NightlyBuildStore
 TEST*
 bin
+build.properties
 jskad.log
 qd.log
 savant.log
diff --git a/junitbuild.xml b/junitbuild.xml
index b0fa03c..41369c9 100644
--- a/junitbuild.xml
+++ b/junitbuild.xml
@@ -25,6 +25,9 @@
   <taskdef name="junitreport"
            classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"/>
 
+  <property file="build.properties"/>
+  <property name="halt.after.trouble" value="no"/>
+
   <target name="fail-nicely"
           description="Tells the user to use build.xml, not this subbuildfile.">
     <fail message="Do not use this file directly; use build.xml instead, which then uses this file."/>
@@ -34,7 +37,7 @@
   <!-- This creates output files TEST* in the Jskad/ directory. -->
   <target name="run-headed-junit-tests"
           description="Assuming that compilation of appropriate classes has been done, this target runs all the JUnit tests in the project.">
-    <junit fork="no" printsummary="yes" haltonfailure="no" haltonerror="no">
+    <junit fork="no" printsummary="yes" haltonfailure="${halt.after.trouble}" haltonerror="${halt.after.trouble}">
     <!-- we don't halt on error because you get an error when you run
          on a headless display -->
       <classpath>