diff --git a/tests/pillar/api_cluster.sls b/tests/pillar/api_cluster.sls
index 645b0be..4322f07 100644
--- a/tests/pillar/api_cluster.sls
+++ b/tests/pillar/api_cluster.sls
@@ -31,6 +31,3 @@
       - host: 127.0.0.1
       - host: 127.0.1.1
       - host: 127.0.2.1
-    haproxy_amphora:
-        client_cert: '/etc/octavia/certs/client.pem'
-        server_ca: '/etc/octavia/certs/ca_01.pem'
diff --git a/tests/pillar/api_single.sls b/tests/pillar/api_single.sls
index 29ab5f7..4f9411c 100644
--- a/tests/pillar/api_single.sls
+++ b/tests/pillar/api_single.sls
@@ -27,6 +27,3 @@
       user: openstack
       password: password
       virtual_host: '/openstack'
-    haproxy_amphora:
-        client_cert: '/etc/octavia/certs/client.pem'
-        server_ca: '/etc/octavia/certs/ca_01.pem'
diff --git a/tests/pillar/manager_single.sls b/tests/pillar/manager_single.sls
index 4ded26b..2087332 100644
--- a/tests/pillar/manager_single.sls
+++ b/tests/pillar/manager_single.sls
@@ -25,7 +25,6 @@
       password: password
       virtual_host: '/openstack'
     certificates:
-      ca_private_key_passphrase: foobar
       ca_private_key: '/etc/octavia/certs/private/cakey.pem'
       ca_certificate: '/etc/octavia/certs/ca_01.pem'
     controller_worker:
@@ -35,6 +34,8 @@
       loadbalancer_topology: 'SINGLE'
     haproxy_amphora:
       client_cert: '/etc/octavia/certs/client.pem'
+      client_cert_key: '/etc/octavia/certs/client.key'
+      client_cert_all: '/etc/octavia/certs/client_all.pem'
       server_ca: '/etc/octavia/certs/ca_01.pem'
     health_manager:
       bind_ip: 192.168.0.12