diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a9f70d..52bc5d8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   pull_request:
   push:
-    branches: 
+    branches:
       - 'master'
     tags:
       - '*'
@@ -40,12 +40,21 @@ jobs:
         include:
           - python-version: 3.6
             tox-env: py36-tests
+            auth-method: token
           - python-version: 3.7
             tox-env: py37-tests
+            auth-method: token
           - python-version: 3.8
             tox-env: py38-tests
+            auth-method: token
+          - python-version: 3.8
+            tox-env: py38-tests
+            auth-method: userpass
+          - python-version: 3.8
+            tox-env: py38-tests
+            auth-method: cert
 
-    name: Test (python ${{ matrix.python-version }})
+    name: Test (python ${{ matrix.python-version }} / ${{ matrix.auth-method }})
     runs-on: ubuntu-latest
 
     services:
@@ -66,7 +75,7 @@ jobs:
           set -xeu
           pwd
           python -VV
-          ./dev-env auth token
+          ./dev-env auth ${{ matrix.auth-method }}
           pip install tox
       - name: Run tox targets for ${{ matrix.python-version }}
         run: tox -e ${{ matrix.tox-env }}
diff --git a/.gitignore b/.gitignore
index 87d35d4..04b71cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ dist/
 docs/_build
 htmlcov/
 vault.yml
+server-chain.crt
+client.crt
+client.key
diff --git a/dev-env b/dev-env
index a48df0e..5949361 100755
--- a/dev-env
+++ b/dev-env
@@ -2,6 +2,11 @@
 
 case ${1-default} in
     auth)
+        curl -o server-chain.crt https://raw.githubusercontent.com/ewjoachim/vault-cli-dev/master/conf/certs/server-chain.crt
+        if [ "${2}" = "cert" ]; then
+            curl -o client.crt https://raw.githubusercontent.com/ewjoachim/vault-cli-dev/master/conf/certs/client.crt
+            curl -o client.key https://raw.githubusercontent.com/ewjoachim/vault-cli-dev/master/conf/certs/client.key
+        fi
         ln -fs vault.${2}.yml vault.yml
         ;;
     *)
diff --git a/server-chain.crt b/server-chain.crt
deleted file mode 100644
index 3ec7ee8..0000000
--- a/server-chain.crt
+++ /dev/null
@@ -1,42 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSDCCAjACFD8JjJiWiavXJRdu8tNpf6WaSSALMA0GCSqGSIb3DQEBCwUAMGYx
-CzAJBgNVBAYTAklOMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMG
-A1UECgwMT3JnYW5pemF0aW9uMQ0wCwYDVQQLDARyb290MRIwEAYDVQQDDAlsb2Nh
-bGhvc3QwIBcNMTkwNzA0MTYzNTUwWhgPMjE1NjA1MjYxNjM1NTBaMFkxGTAXBgoJ
-kiaJk/IsZAEZFglsb2NhbGhvc3QxFzAVBgNVBAoMDlZhdWx0IENsaSBUZXN0MQ8w
-DQYDVQQLDAZzZXJ2ZXIxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMazfiBLwqbS6DKIqaHAqeJifIniM4AwMEokONOS
-DAZhnWVKEvipSR8wCUrMh0MW7YW+oJxBjKjBEfgqhls28osHbPC21Dq19xDIEmK1
-aVmDvIlLACysyVMvCiVJXG+qEY0DrqaMX3PGeMefXc64txFOTbvEDhUAMFupB+FY
-yxQ8f/qL/wFGyD++kYmPrsQW5UL8cF3+txXQXFeSyNTM1k9e6aU+az6rEHfd8BSG
-14EtKocYfxsyO5iWrMc+q2d1pukFcV23uNmtVnX+hTq+Cbu/CG8KSqc8bCSEr+im
-z1nav/eKQpEKFNgJawMbXltuZ0ZFPgPi3bQ9GR8Y54VRTLcCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAZUTIKiuciGj5zwixniEJLjHFP5DT7+4+HaUQXYxkyeKrKrK8
-9Rgpshesqyza452TKGkzgn3RXCxlIx66A90Ho7it/ecMRaJHN3fm4z9PXs4tGMri
-Mn6zjqcOwvB5Yax7gA2BPE+4Hqbqi19y/lkGRFY2oUvJ+ciuztGNHBF8wlRhbLA9
-SZLMQGIViSpCbRUZ6B1oucDOL17uf/2GtPf1D/PeYGmyiY2m0g/fC2A8eh65kezz
-KQbNgA858IRELhzs5dm68lDXQbotJ9Vp3Tb3GB/66l/qlLLAtvMGzdbfvIpaVeE/
-wKHu0dPlbguNFQMg8bYQ3Nd7FV4mkQXVq+cuKA==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIUS/oF8XQ1MSLU6Gs/OlrTdNU3f20wDQYJKoZIhvcNAQEL
-BQAwZjELMAkGA1UEBhMCSU4xDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
-MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xDTALBgNVBAsMBHJvb3QxEjAQBgNVBAMM
-CWxvY2FsaG9zdDAgFw0xOTA3MDQxNjM1NTBaGA8yMTU2MDUyNjE2MzU1MFowZjEL
-MAkGA1UEBhMCSU4xDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5MRUwEwYD
-VQQKDAxPcmdhbml6YXRpb24xDTALBgNVBAsMBHJvb3QxEjAQBgNVBAMMCWxvY2Fs
-aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqH3/8PJ13OM1Iy
-ryj50ZYL3AwP5IVqrwlZ5alqL4ovJiNOEJXIpH+rLTYURYTQtBtaclR4FFxep0XK
-vRccLEe/CupuKr1sve8KtKQB5pB1wP1U7ao/sk7O7hkckI7XNY4JT79/AMCi9dhU
-IOPF5XiyKV2PHP/ycVSy7Ja1EFnTz5JBeOjFD5SBDu3bbo5SjREK8I9mX5YL4gNt
-EtCsd5eAV0fxZ+gDKogtSFsDbsUHMCqIJ5RolMbitQKP8wVqJl0YW/ntgXLq61Y6
-zNPVT7TBLMXdhY2UbqSQQqO416H56d4uDr+0DQsdPRstzYlJr2Z8IKhwsJ1KEklh
-0iXDV20CAwEAAaNTMFEwHQYDVR0OBBYEFFAZR/WEYTjqGiCA4z6xQJEDY6fYMB8G
-A1UdIwQYMBaAFFAZR/WEYTjqGiCA4z6xQJEDY6fYMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAJ7g1nBtxscZv+B2chMBamv1QBItiIwqYkTm1AVM
-3VbjKYP2YCxv4BuZxIOLO/FI1U0LVu90qhNI150ql6lxjk0pTdNenJsN9CbreEf/
-I8ASlULl8WvlZ6bIIdStsuz2Zt86SZtTtTjMmqQAwogtzC5opwhfkQRCoufMEvDf
-QRrguZIsrfjrn/O3FYRcqqOL52i2x9sERuurw0XMy2DBFRWfao+ImLoBsaddkojp
-geKZHBCIUfYQFfsnjMNqSyd2PtM4bS7fqErDFX+NLkOpPHkfNRe8j1dnQtE4nJc/
-a4JXj+Nn55pbX+n/jvIqDj3nT6quJbnIFWfcOJ3o/6d+32I=
------END CERTIFICATE-----
diff --git a/setup.cfg b/setup.cfg
index fb5ae93..0d78dd6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,7 @@ install_requires =
     Click>=7.0
     pyyaml>=5.3.1
     jinja2
-    hvac
+    hvac<0.10.12  # Temporary fix for #191
 
 [options.entry_points]
 console_scripts =
diff --git a/vault.cert.yml b/vault.cert.yml
index e1e8ddb..6144bad 100644
--- a/vault.cert.yml
+++ b/vault.cert.yml
@@ -1,6 +1,6 @@
 ---
 url: https://localhost:8443
 base_path: secretkvv1/
-ca_bundle: dev_docker_config/certs/server-chain.crt
-login_cert: dev_docker_config/certs/client.crt
-login_cert_key: dev_docker_config/certs/client.key
+ca_bundle: server-chain.crt
+login_cert: client.crt
+login_cert_key: client.key
diff --git a/vault.userpass.yml b/vault.userpass.yml
index 09d99b9..726185d 100644
--- a/vault.userpass.yml
+++ b/vault.userpass.yml
@@ -1,6 +1,6 @@
 ---
-base_path: secretkvv1/
-ca_bundle: dev_docker_config/certs/server-chain.crt
 url: https://localhost:8443
+base_path: secretkvv1/
+ca_bundle: server-chain.crt
 username: userpass-login
 password: userpass-pass