diff --git a/tests/unit/haproxy.bats b/tests/unit/haproxy.bats
new file mode 100644
index 000000000..440b9650e
--- /dev/null
+++ b/tests/unit/haproxy.bats
@@ -0,0 +1,83 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  dokku nginx:stop
+  dokku haproxy:start
+  create_app
+}
+
+teardown() {
+  global_teardown
+  destroy_app
+  dokku haproxy:stop
+  dokku nginx:start
+}
+
+@test "(haproxy) haproxy:help" {
+  run /bin/bash -c "dokku haproxy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "Manage the haproxy proxy integration"
+  help_output="$output"
+
+  run /bin/bash -c "dokku haproxy:help"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "Manage the haproxy proxy integration"
+  assert_output "$help_output"
+}
+
+@test "(haproxy) single domain" {
+  run /bin/bash -c "dokku proxy:set $TEST_APP haproxy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run deploy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "curl --silent $(dokku url $TEST_APP)"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "python/http.server"
+}
+
+@test "(haproxy) multiple domains" {
+  run /bin/bash -c "dokku proxy:set $TEST_APP haproxy"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku domains:add $TEST_APP $TEST_APP.dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku domains:add $TEST_APP $TEST_APP-2.dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run deploy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "curl --silent $TEST_APP.dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "python/http.server"
+
+  run /bin/bash -c "curl --silent $TEST_APP-2.dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "python/http.server"
+}