diff --git a/bindep.txt b/bindep.txt
index 2f3d5b8..b24e37e 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -2,4 +2,4 @@ libffi-dev [platform:dpkg]
 libpq-dev [platform:dpkg]
 libxml2-dev [platform:dpkg]
 libxslt1-dev [platform:dpkg]
-
+libpq-dev [platform:dpkg]
diff --git a/requirements.txt b/requirements.txt
index e182e8a..025943f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
 # Build requirements
 pyparsing<3.0.0  # cffi needs pyparsing < 3.0.0.
 cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
-charm-tools==2.8.3
+charm-tools<3.0.0
 
 simplejson
 
diff --git a/src/tests/bundles/bionic-train-ha-ovn.yaml b/src/tests/bundles/bionic-train-ha-ovn.yaml
index 45465e7..946e9b0 100644
--- a/src/tests/bundles/bionic-train-ha-ovn.yaml
+++ b/src/tests/bundles/bionic-train-ha-ovn.yaml
@@ -194,4 +194,4 @@ applications:
   vault:
     charm: ch:vault
     num_units: 1
-    channel: 1.7/edge
+    channel: 1.6/edge
diff --git a/src/tests/bundles/bionic-train-ha.yaml b/src/tests/bundles/bionic-train-ha.yaml
index 0cf3603..f268e09 100644
--- a/src/tests/bundles/bionic-train-ha.yaml
+++ b/src/tests/bundles/bionic-train-ha.yaml
@@ -191,4 +191,4 @@ applications:
   vault:
     charm: ch:vault
     num_units: 1
-    channel: 1.7/edge
+    channel: 1.6/edge
diff --git a/tox.ini b/tox.ini
index 9a79c57..fb46ad0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -97,7 +97,8 @@ commands = stestr run --slowest {posargs}
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2
-       charm-tools==2.8.3
+       PyYAML==6.0.1
+       charm-tools<3.0.0
 commands = flake8 {posargs} src unit_tests
 
 [testenv:func-target]