diff --git a/build.xml b/build.xml
index a0fe7c5ec8..f29aa8d372 100644
--- a/build.xml
+++ b/build.xml
@@ -82,7 +82,11 @@ under the License.
     <property name="POI.testdata.path" value="test-data"/>
     <property name="java.awt.headless" value="true"/>
     <property name="additionaljar" value=""/>
-    <property name="http_proxy" value="${env.http_proxy}"/>
+	<condition property="http_proxy" 
+	   value="${env.http_proxy}"
+	   else="">
+		<isset property="env.http_proxy"/>
+	</condition>
 
     <!-- Main: -->
     <property name="main.resource1.dir" value="src/resources/main"/>
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 ded14dfba9..fe8ce80111 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
@@ -316,7 +316,7 @@ public class TestSignatureInfo {
         signatureConfig.addSignatureFacet(new XAdESXLSignatureFacet());
         
         // check for internet, no error means it works
-        boolean mockTsp = (getAccessError("http://timestamp.comodoca.com/rfc3161", true, 10000) == null);
+        boolean mockTsp = (getAccessError("http://timestamp.comodoca.com/rfc3161", true, 10000) != null);
         
         // http://timestamping.edelweb.fr/service/tsp
         // http://tsa.belgium.be/connect