Index: test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java
===================================================================
--- test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java	(revision 0)
+++ test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java	(revision 0)
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.layoutengine;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import org.junit.AfterClass;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Class for testing the FOP's hyphenation layout engine using testcases specified in XML
+ * files.
+ */
+public class HyphenationLayoutTestCase extends LayoutEngineTestCase {
+    private static final String SYSTEM_PROPERTY = "fop.layoutengine.testset";
+
+    /**
+     * Creates the parameters for this test.
+     *
+     * @return the list of file arrays populated with test files
+     * @throws IOException if an I/O error occurs while reading the test file
+     */
+    @Parameters
+    public static Collection<File[]> getParameters() throws IOException {
+        System.setProperty(SYSTEM_PROPERTY, "hyphenation");
+        return LayoutEngineTestUtils.getLayoutTestFiles();
+    }
+
+    /**
+     * Constructor
+     * @param testFile the file to test
+     */
+    public HyphenationLayoutTestCase(File testFile) {
+        super(testFile);
+    }
+
+    /**
+     * This MUST be invoked, otherwise the other layout engine tests will fail to run properly.
+     */
+    @AfterClass
+    public static void resetSysProperty() {
+        System.setProperty(SYSTEM_PROPERTY, "");
+    }
+
+}
Index: test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java
===================================================================
--- test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java	(revision 1199153)
+++ test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java	(working copy)
@@ -174,7 +174,7 @@
     public static Collection<File[]> getLayoutTestFiles() {
         TestFilesConfiguration.Builder builder = new TestFilesConfiguration.Builder();
         String testSet = System.getProperty("fop.layoutengine.testset");
-        testSet = (testSet != null ? testSet : "standard") + "-testcases";
+        testSet = (testSet != null && testSet.length() != 0 ? testSet : "standard") + "-testcases";
 
         builder.testDir("test/layoutengine")
                .singleProperty("fop.layoutengine.single")
Index: test/java/org/apache/fop/events/EventChecker.java
===================================================================
--- test/java/org/apache/fop/events/EventChecker.java	(revision 1199153)
+++ test/java/org/apache/fop/events/EventChecker.java	(working copy)
@@ -28,7 +28,7 @@
 
     private final String expectedEventID;
 
-    private boolean eventReceived;
+    private boolean eventReceived = false;
 
     EventChecker(String expectedEventID) {
         this.expectedEventID = expectedEventID;
Index: build.xml
===================================================================
--- build.xml	(revision 1199153)
+++ build.xml	(working copy)
@@ -699,9 +699,7 @@
     <copy todir="${build.unit.tests.dir}">
       <fileset dir="${test.dir}/java">
         <include name="META-INF/**"/>
-        <include name="**/*.xml"/>
-        <include name="**/*.fo"/>
-        <include name="**/*.afp"/>
+        <include name="**/*"/>
       </fileset>
       <fileset dir="${build.dir}/test-gensrc">
         <include name="**/*.xml"/>
@@ -784,7 +782,7 @@
     </sequential>
   </macrodef>
   <target name="junit-all" depends="junit-compile, junit-transcoder, junit-layout-hyphenation, setup-xml-schema" description="Runs FOP's JUnit basic tests" if="junit.present">
-    <junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+    <junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}" forkmode="once" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
       <sysproperty key="jawa.awt.headless" value="true"/>
       <formatter type="brief" usefile="false"/>
       <formatter type="plain" usefile="true"/>
@@ -807,8 +805,7 @@
     <junit-run title="standard layout engine" testsuite="org.apache.fop.layoutengine.LayoutEngineTestSuite" outfile="TEST-layoutengine-standard"/>
   </target>
   <target name="junit-layout-hyphenation" depends="hyphenation-present, junit-compile" if="hyphenation.present" description="Runs FOP's JUnit hyphenation layout tests">
-    <property name="fop.layoutengine.testset" value="hyphenation"/>
-    <junit-run title="hyphenation layout engine" testsuite="org.apache.fop.layoutengine.LayoutEngineTestSuite" outfile="TEST-layoutengine-hyphenation"/>
+    <junit-run title="hyphenation layout engine" testsuite="org.apache.fop.layoutengine.HyphenationLayoutTestCase" outfile="TEST-layoutengine-hyphenation"/>
   </target>
   <target name="junit-layout" depends="junit-layout-standard, junit-layout-hyphenation" description="Runs all FOP's JUnit layout tests"/>
   <target name="junit-fotree" depends="junit-compile" description="Runs FOP's FO tree JUnit tests" if="junit.present">
@@ -851,7 +848,8 @@
     <junit-run title="render-pdf" testsuite="org.apache.fop.render.pdf.RenderPDFTestSuite" outfile="TEST-render-pdf"/>
   </target>
   <target name="junit-reduced" depends="junit-userconfig, junit-basic, junit-transcoder, junit-text-linebreak, junit-fotree, junit-render-pdf"/>
-  <target name="junit" depends="junit-all" description="Runs all of FOP's JUnit tests" if="junit.present">
+  <target name="junit" depends="junit-all" description="Runs all of FOP's JUnit tests" 
+    if="junit.present">
     <fail><condition><or><isset property="fop.junit.error"/><isset property="fop.junit.failure"/><not><isset property="hyphenation.present"/></not></or></condition>
 NOTE:
 **************************************************************************