diff --git a/build.xml b/build.xml
index 0443883d2..40ecb104a 100644
--- a/build.xml
+++ b/build.xml
@@ -293,6 +293,7 @@ under the License.
         <pathelement location="${ooxml.output.dir}"/>
         <pathelement location="${ooxml.output.test.dir}"/>
         <pathelement location="${main.output.test.dir}"/>
+        <pathelement location="${ooxml.security.jar}"/>
     </path>
 
 
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
index 34c8d59ef..d99aadd9c 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
@@ -482,8 +482,7 @@ public class TestSignatureInfo {
         si.confirmSignature();
         
         for (SignaturePart sp : si.getSignatureParts()){
-            boolean b = sp.validate();
-            assertTrue(b);
+            assertTrue("Could not validate", sp.validate());
             X509Certificate signer = sp.getSigner();
             assertNotNull("signer undefined?!", signer);
             List<X509Certificate> certChainRes = sp.getCertChain();