diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml
index 3bdd5dba2..9e5e17027 100644
--- a/.github/workflows/tox.yaml
+++ b/.github/workflows/tox.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v1
diff --git a/requirements.txt b/requirements.txt
index cfa9f59c1..1abf6292c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -41,3 +41,5 @@ python-libmaas
 # Documentation requirements
 sphinx
 sphinxcontrib-asyncio
+# https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
+macaroonbakery!=1.3.3
diff --git a/setup.py b/setup.py
index 87445e411..2d41ffcf9 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,9 @@
     'PyYAML',
     'tenacity',
     'python-libmaas',
+
+    # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
+    'macaroonbakery != 1.3.3',
 ]
 
 tests_require = [