diff --git a/charmcraft.yaml b/charmcraft.yaml
index 1929e67af..0b81554c9 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -12,4 +12,4 @@ bases:
 
 parts:
   charm:
-    charm-binary-python-packages: [psycopg2-binary==2.9.5, setuptools]
+    charm-binary-python-packages: [psycopg2-binary==2.9.5]
diff --git a/tests/integration/relations/pgbouncer_provider/application-charm/charmcraft.yaml b/tests/integration/relations/pgbouncer_provider/application-charm/charmcraft.yaml
index 0e8188917..959a3b887 100644
--- a/tests/integration/relations/pgbouncer_provider/application-charm/charmcraft.yaml
+++ b/tests/integration/relations/pgbouncer_provider/application-charm/charmcraft.yaml
@@ -10,7 +10,6 @@ bases:
       - name: "ubuntu"
         channel: "20.04"
 
-
 parts:
   charm:
-    charm-binary-python-packages: [psycopg2-binary==2.9.5, setuptools]
\ No newline at end of file
+    charm-binary-python-packages: [psycopg2-binary==2.9.3]
diff --git a/tests/integration/relations/pgbouncer_provider/conftest.py b/tests/integration/relations/pgbouncer_provider/conftest.py
index 958488e60..1f844ed80 100644
--- a/tests/integration/relations/pgbouncer_provider/conftest.py
+++ b/tests/integration/relations/pgbouncer_provider/conftest.py
@@ -6,6 +6,7 @@
 from pytest_operator.plugin import OpsTest
 
 
+@pytest.mark.abort_on_fail
 @pytest.fixture(scope="module")
 async def application_charm(ops_test: OpsTest):
     """Build the application charm."""
@@ -13,6 +14,7 @@ async def application_charm(ops_test: OpsTest):
     return await ops_test.build_charm(test_charm_path)
 
 
+@pytest.mark.abort_on_fail
 @pytest.fixture(scope="module")
 async def pgb_charm(ops_test: OpsTest):
     """Build the pgbouncer charm."""