diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy
index b26591e1d72..a90fcc855ca 100644
--- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy
+++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy
@@ -16,10 +16,12 @@
 
 package com.netflix.spinnaker.orca.clouddriver.tasks.monitoreddeploy
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spectator.api.NoopRegistry
 import com.netflix.spinnaker.config.DeploymentMonitorDefinition
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
 import com.netflix.spinnaker.orca.api.pipeline.TaskResult
+import com.netflix.spinnaker.orca.clouddriver.MortServiceSpec
 import com.netflix.spinnaker.orca.deploymentmonitor.DeploymentMonitorService
 import com.netflix.spinnaker.orca.deploymentmonitor.models.DeploymentMonitorStageConfig
 import com.netflix.spinnaker.orca.deploymentmonitor.models.DeploymentStep
@@ -27,7 +29,10 @@ import com.netflix.spinnaker.orca.deploymentmonitor.models.EvaluateHealthRespons
 import com.netflix.spinnaker.orca.deploymentmonitor.models.MonitoredDeployInternalStageData
 import com.netflix.spinnaker.orca.pipeline.model.PipelineExecutionImpl
 import com.netflix.spinnaker.orca.pipeline.model.StageExecutionImpl
+import org.springframework.http.HttpStatus
 import retrofit.RetrofitError
+import retrofit.client.Response
+import retrofit.converter.JacksonConverter
 import spock.lang.Specification
 import com.netflix.spinnaker.orca.deploymentmonitor.DeploymentMonitorServiceProvider
 import spock.lang.Unroll
@@ -198,6 +203,50 @@ class EvaluateDeploymentHealthTaskSpec extends Specification {
     false              | null             || ExecutionStatus.FAILED_CONTINUE
   }
 
+  def "should return status as RUNNING when Retrofit http error is thrown"() {
+
+    def converter = new JacksonConverter(new ObjectMapper())
+
+    Response response =
+        new Response(
+            "/deployment/evaluateHealth",
+            HttpStatus.BAD_REQUEST.value(),
+            "bad-request",
+            Collections.emptyList(),
+            new MortServiceSpec.MockTypedInput(converter, [
+                accountName: "account",
+                description: "simple description",
+                name: "sg1",
+                region: "region",
+                type: "openstack"
+            ]))
+
+    given:
+    def monitorServiceStub = Stub(DeploymentMonitorService) {
+      evaluateHealth(_) >> {
+        throw RetrofitError.httpError("https://foo.com/deployment/evaluateHealth", response, converter, null)
+      }
+    }
+
+    def serviceProviderStub = getServiceProviderStub(monitorServiceStub)
+
+    def task = new EvaluateDeploymentHealthTask(serviceProviderStub, new NoopRegistry())
+
+    MonitoredDeployInternalStageData stageData = new MonitoredDeployInternalStageData()
+    stageData.deploymentMonitor = new DeploymentMonitorStageConfig()
+    stageData.deploymentMonitor.id = "LogMonitorId"
+
+    def stage = new StageExecutionImpl(pipe, "evaluateDeploymentHealth", stageData.toContextMap() + [application: pipe.application])
+    stage.startTime = Instant.now().toEpochMilli()
+
+    when: 'we can still retry'
+    TaskResult result = task.execute(stage)
+
+    then: 'should retry'
+    result.status == ExecutionStatus.RUNNING
+    result.context.deployMonitorHttpRetryCount == 1
+  }
+
   private getServiceProviderStub(monitorServiceStub) {
     return getServiceProviderStub(monitorServiceStub, {})
   }