2 files changed, 18 insertions, 2 deletions
diff --git a/test/java/org/apache/fop/apps/FopConfBuilder.java b/test/java/org/apache/fop/apps/FopConfBuilder.java
index 1efb2d698..8dd882d8a 100644
--- a/test/java/org/apache/fop/apps/FopConfBuilder.java
+++ b/test/java/org/apache/fop/apps/FopConfBuilder.java
@@ -113,7 +113,17 @@ public class FopConfBuilder implements FontConfigurator<FopConfBuilder> {
     /**
      * Set the &lt;strict-validation&gt; tag within the fop.xconf.
      *
-     * @param validateStrictly true to enforce strict validation
+     * @param validateStrictly true to enforce strict FO validation
+     * @return <b>this</b>
+     */
+    public FopConfBuilder setStrictConfiguration(boolean validateStrictly) {
+        return createElement("strict-configuration", String.valueOf(validateStrictly));
+    }
+
+    /**
+     * Set the &lt;strict-validation&gt; tag within the fop.xconf.
+     *
+     * @param validateStrictly true to enforce strict configuration validation
      * @return <b>this</b>
      */
     public FopConfBuilder setStrictValidation(boolean validateStrictly) {
diff --git a/test/java/org/apache/fop/apps/FopConfParserTestCase.java b/test/java/org/apache/fop/apps/FopConfParserTestCase.java
index 775bca30a..3c2930942 100644
--- a/test/java/org/apache/fop/apps/FopConfParserTestCase.java
+++ b/test/java/org/apache/fop/apps/FopConfParserTestCase.java
@@ -75,12 +75,18 @@ public class FopConfParserTestCase {
     }
 
     @Test
-    public void testStrictUserConfigValidation() {
+    public void testStrictFOValidation() {
         builder.setStrictValidation(false);
         assertFalse(buildFactory().validateStrictly());
     }
 
     @Test
+    public void testStrictUserValidation() {
+        builder.setStrictConfiguration(false);
+        assertFalse(buildFactory().validateUserConfigStrictly());
+    }
+
+    @Test
     public void testAccessibility() {
         builder.setAccessibility(false);
         assertFalse(buildFactory().isAccessibilityEnabled());