diff --git a/build-requirements.txt b/build-requirements.txt
index 271d895..9230009 100644
--- a/build-requirements.txt
+++ b/build-requirements.txt
@@ -1 +1,2 @@
 git+https://github.com/canonical/charmcraft.git@0.10.2#egg=charmcraft
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35
diff --git a/templates/haproxy.cfg b/templates/haproxy.cfg
index 67044db..2651f3f 100644
--- a/templates/haproxy.cfg
+++ b/templates/haproxy.cfg
@@ -23,9 +23,15 @@ frontend {{service}}_front
 
 backend {{service}}_back
   mode tcp
+{%- if service_config.check_type == 'http' %}
   option httpchk GET /
   http-check expect status 200
+{%- endif %}
 {%- for unit in service_config.members %}
+{%- if service_config.check_type == 'http' %}
   server {{ unit.unit_name }} {{ unit.backend_ip }}:{{ unit.backend_port }} check-ssl check verify none
+{%- else %}
+  server {{ unit.unit_name }} {{ unit.backend_ip }}:{{ unit.backend_port }} check
+{%- endif %}
 {%- endfor %}
 {% endfor %}
diff --git a/test-requirements.txt b/test-requirements.txt
index 8057d2c..9121813 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,3 +15,4 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
 pytz    # workaround for 14.04 pip/tox
 pyudev  # for ceph-* charm unit tests (not mocked?)
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 1f82339..fc63381 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -14,3 +14,6 @@ target_deploy_status:
   vault:
     workload-status: blocked
     workload-status-message-prefix: Vault needs to be initialized
+tests_options:
+  force_deploy:
+    - hirsute
\ No newline at end of file