diff --git a/integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsFailureTest.scala b/integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsFailureTest.scala
index d8fdb9f2a..34f30fe90 100644
--- a/integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsFailureTest.scala
+++ b/integration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsFailureTest.scala
@@ -1,50 +1,45 @@
 package net.shrine.integration
 
 import org.junit.Test
-import net.shrine.protocol.BroadcastMessage
-import net.shrine.protocol.DeleteQueryRequest
+import net.shrine.protocol.{ErrorResponse, BroadcastMessage, DeleteQueryRequest, Result, DeleteQueryResponse, DefaultBreakdownResultOutputTypes}
 import net.shrine.crypto.DefaultSignerVerifier
 import net.shrine.crypto.TestKeystore
 import scala.concurrent.Await
-import net.shrine.protocol.Result
-import net.shrine.protocol.DeleteQueryResponse
 import com.sun.jersey.api.client.UniformInterfaceException
 import net.shrine.adapter.service.AdapterResource
-import net.shrine.protocol.DefaultBreakdownResultOutputTypes
 import net.shrine.crypto.SigningCertStrategy
 
 /**
  * @author clint
- * @date Dec 17, 2013
+ * @since Dec 17, 2013
  */
 final class AdapterResourceEndToEndJaxRsFailureTest extends AbstractAdapterResourceJaxRsTest {
   
   override val makeHandler = AlwaysThrowsAdapterRequestHandler
   
   @Test
   def testHandleRequestWithServerSideException {
     import scala.concurrent.duration._
     
     val masterId = 12345L
     
     val unsigned = BroadcastMessage(networkAuthn, DeleteQueryRequest("some-project", 1.minute, networkAuthn, masterId))
     
     val signer = new DefaultSignerVerifier(TestKeystore.certCollection)
     
     val signed = signer.sign(unsigned, SigningCertStrategy.Attach)
-    
-    //Failures at the server side should result in the client completing its Future with an exception
-    intercept[Exception] {
-      Await.result(client.query(signed), 1.hour)
-    }
+
+    val result = Await.result(client.query(signed), 1.hour)
+
+    result.response.isInstanceOf[ErrorResponse] should be(true)
   }
   
   @Test
   def testHandleRequestWithBadInput {
     val resource = AdapterResource(MockAdapterRequestHandler)
     
     intercept[Exception] {
       resource.handleRequest("aslkdjlaksjdlasdj")
     }
   }
 }
\ No newline at end of file