diff --git a/jobs/rep/spec b/jobs/rep/spec
index 60a49eaf8a..9dc49f2066 100644
--- a/jobs/rep/spec
+++ b/jobs/rep/spec
@@ -213,7 +213,7 @@ properties:
     description: "EXPERIMENTAL: Maximum log lines allowed per second per app instance. Default value of 0 will disable rate limiting. Minimum recommended value is 100."
     default: 0
   diego.executor.declarative_healthcheck_default_timeout:
-    description: "Default timeout for declarative healthcheck. This value is used when the LRP spec does not specify a timeout. Only used if 'enable_declarative_healthcheck' is set to true."
+    description: "Default timeout for declarative healthcheck. This value is used when the LRP spec does not specify a timeout."
     default: "1s"
 
   diego.rep.bbs.api_location:
@@ -245,11 +245,8 @@ properties:
     description: "Maximum container capacity per rep"
     default: 250
 
-  enable_declarative_healthcheck:
-    description: "When set, enables the rep to prefer the LRP CheckDefinition to healthcheck instances over the Monitor action. Requires Garden-Runc v1.10.0+"
-    default: false
   enable_healthcheck_metrics:
-    description: "When set, enables the rep to emit healtcheck failure metrics. Requires enable_declarative_healthcheck to be set to true."
+    description: "When set, enables the rep to emit healtcheck failure metrics."
     default: false
   cell_registrations.locket.enabled:
     description: Enable the cell rep to register itself as a service with Locket.
diff --git a/jobs/rep/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb
index 8fef27c12c..099c094da5 100644
--- a/jobs/rep/templates/rep.json.erb
+++ b/jobs/rep/templates/rep.json.erb
@@ -57,7 +57,6 @@
     debug_address: p("diego.rep.debug_addr"),
     delete_work_pool_size: p("diego.executor.delete_work_pool_size"),
     disk_mb: p("diego.executor.disk_capacity_mb").to_s,
-    enable_declarative_healthcheck: p("enable_declarative_healthcheck"),
     declarative_healthcheck_path: "/var/vcap/packages/healthcheck",
     enable_healthcheck_metrics: p("enable_healthcheck_metrics"),
     enable_container_proxy: p("containers.proxy.enabled"),
diff --git a/jobs/rep_windows/spec b/jobs/rep_windows/spec
index 161bc28214..d84d1c5849 100644
--- a/jobs/rep_windows/spec
+++ b/jobs/rep_windows/spec
@@ -204,7 +204,7 @@ properties:
     description: "EXPERIMENTAL: Maximum log lines allowed per second per app instance. Default value of 0 will disable rate limiting. Minimum recommended value is 100."
     default: 0
   diego.executor.declarative_healthcheck_default_timeout:
-    description: "Default timeout for declarative healthcheck. This value is used when the LRP spec does not specify a timeout. Only used if 'enable_declarative_healthcheck' is set to true."
+    description: "Default timeout for declarative healthcheck. This value is used when the LRP spec does not specify a timeout."
     default: "1s"
 
   diego.rep.bbs.api_location:
@@ -249,14 +249,11 @@ properties:
     description: "Timeout in seconds to receive a response to the keepalive ping. If a response is not received within this time, the locket client will reconnect to another server."
     default: 22
 
-  enable_declarative_healthcheck:
-    description: "When set, enables the rep to prefer the LRP CheckDefinition to healthcheck instances over the Monitor action."
-    default: false
   declarative_healthcheck_path:
     description: "The directory containing the declarative healthcheck binary"
     default: "/var/vcap/packages/healthcheck_windows/external"
   enable_healthcheck_metrics:
-    description: "When set, enables the rep to emit healtcheck failure metrics. Requires enable_declarative_healthcheck to be set to true."
+    description: "When set, enables the rep to emit healtcheck failure metrics."
     default: false
 
   cell_registrations.locket.enabled:
diff --git a/jobs/rep_windows/templates/pre-start.ps1.erb b/jobs/rep_windows/templates/pre-start.ps1.erb
index 510634dea8..96e435cb4f 100644
--- a/jobs/rep_windows/templates/pre-start.ps1.erb
+++ b/jobs/rep_windows/templates/pre-start.ps1.erb
@@ -75,10 +75,8 @@ $bindmountDirs += $service_bindings_dir
   $bindmountDirs += $trusted_certs_dir
 <% end %>
 
-<% if p("enable_declarative_healthcheck") %>
-  $healthcheckDir = "<%= p("declarative_healthcheck_path") %>"
-  $bindmountDirs += $healthcheckDir
-<% end %>
+$healthcheckDir = "<%= p("declarative_healthcheck_path") %>"
+$bindmountDirs += $healthcheckDir
 
 <% if p("diego.rep.open_bindmounts_acl") %>
   foreach ($dir in $bindmountDirs)
diff --git a/jobs/rep_windows/templates/rep.json.erb b/jobs/rep_windows/templates/rep.json.erb
index ea4664dc7b..86450f7c5a 100644
--- a/jobs/rep_windows/templates/rep.json.erb
+++ b/jobs/rep_windows/templates/rep.json.erb
@@ -57,7 +57,6 @@
     debug_address: p("diego.rep.debug_addr"),
     delete_work_pool_size: p("diego.executor.delete_work_pool_size"),
     disk_mb: p("diego.executor.disk_capacity_mb").to_s,
-    enable_declarative_healthcheck: p("enable_declarative_healthcheck"),
     declarative_healthcheck_path: p("declarative_healthcheck_path"),
     enable_healthcheck_metrics: p("enable_healthcheck_metrics"),
     enable_container_proxy: p("containers.proxy.enabled"),
diff --git a/jobs/vizzini/spec b/jobs/vizzini/spec
index b42ae9d49f..855b759a42 100644
--- a/jobs/vizzini/spec
+++ b/jobs/vizzini/spec
@@ -48,9 +48,6 @@ properties:
     description: Run tests in verbose mode
     default: false
 
-  enable_declarative_healthcheck:
-    description: "When set, enables the declarative check tests in vizzini"
-    default: false
 
   max_task_retries:
     description: "When set, allows for rejected tasks to be retried"
diff --git a/jobs/vizzini/templates/vizzini.json.erb b/jobs/vizzini/templates/vizzini.json.erb
index 0a00ce0d48..5316eb5128 100644
--- a/jobs/vizzini/templates/vizzini.json.erb
+++ b/jobs/vizzini/templates/vizzini.json.erb
@@ -8,7 +8,6 @@ config = {
   ssh_address: p("vizzini.ssh.proxy_address"),
   routable_domain_suffix: p("vizzini.routable_domain_suffix"),
   host_addresss: spec.ip,
-  enable_declarative_healthcheck: p("enable_declarative_healthcheck"),
   enable_container_proxy_tests: p("enable_container_proxy_tests"),
   enable_privileged_container_tests: p("enable_privileged_container_tests"),
   rep_placement_tags: p("vizzini.rep.placement_tags"),
diff --git a/scripts/test-in-docker.bash b/scripts/test-in-docker.bash
index 34d9908806..d39545ee6f 100755
--- a/scripts/test-in-docker.bash
+++ b/scripts/test-in-docker.bash
@@ -2,7 +2,7 @@
 
 set -eu
 
-THIS_FILE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+THIS_FILE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 CI="${THIS_FILE_DIR}/../../wg-app-platform-runtime-ci"
 . "$CI/shared/helpers/git-helpers.bash"
 REPO_NAME=$(git_get_remote_name)
@@ -16,5 +16,5 @@ DB="${DB}" "${THIS_FILE_DIR}/create-docker-container.bash" -d
 
 docker exec $CONTAINER_NAME '/repo/scripts/docker/build-binaries.bash'
 docker exec $CONTAINER_NAME '/repo/scripts/docker/tests-templates.bash'
-docker exec $CONTAINER_NAME '/repo/scripts/docker/test.bash' "$@"
 docker exec $CONTAINER_NAME '/repo/scripts/docker/lint.bash'
+docker exec $CONTAINER_NAME '/repo/scripts/docker/test.bash' "$@"
diff --git a/spec/rep_template_spec.rb b/spec/rep_template_spec.rb
index fbaac3118c..083e6d439d 100644
--- a/spec/rep_template_spec.rb
+++ b/spec/rep_template_spec.rb
@@ -52,7 +52,6 @@
         ]
       },
       'enable_consul_service_registration' => 'false',
-      'enable_declarative_healthcheck' => 'true',
       'loggregator' => {},
       'tls' => {
         'ca_cert' => 'CA CERT',