diff --git a/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java b/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
index 39fbb73638..0870ce213e 100644
--- a/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
+++ b/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
@@ -47,6 +47,7 @@
 import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.util.Utils;
 import org.apache.axis2.wsdl.WSDLConstants;
 
 public class FaultHandlingTest extends UtilServerBasedTestCase implements TestConstants {
@@ -63,6 +64,9 @@ protected void setUp() throws Exception {
                 configurationContext.getAxisConfiguration().getInFlowPhases();
         Phase phaseOne = (Phase)inPhasesUptoAndIncludingPostDispatch.get(0);
         phaseOne.addHandler(new FaultHandler());
+        UtilServer.deployService(Utils.createSimpleService(serviceName,
+                Echo.class.getName(),
+                operationName));
     }
 
     public void testFaultHandlingWithParamsSetToMsgCtxt() throws AxisFault {
@@ -173,6 +177,7 @@ public File getTestResourceFile(String relativePath) {
     }
 
     protected void tearDown() throws Exception {
+        UtilServer.unDeployService(serviceName);
     }
 
     public void testExceptionInformationExtractionFromAxisFault() {
diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
index 48d2e1a5c6..e99c36e97f 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
@@ -205,7 +205,7 @@ public void send(MessageContext msgContext, URL url, String soapActionString)
                     processResponse = true;
                     fault = false;
                 } else if (statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR
-                           || statusCode == HttpStatus.SC_BAD_REQUEST || statusCode == HttpStatus.SC_NOT_FOUND) {
+                           || statusCode == HttpStatus.SC_BAD_REQUEST) {
                     processResponse = true;
                     fault = true;
                 } else {