diff --git a/tests/test_ctl.py b/tests/test_ctl.py
index b2590da5..3987619d 100644
--- a/tests/test_ctl.py
+++ b/tests/test_ctl.py
@@ -1,5 +1,6 @@
 import os
 import pytest
+import requests.exceptions
 import unittest
 
 from click.testing import CliRunner
@@ -10,7 +11,6 @@ from patroni.ctl import ctl, members, store_config, load_config, output_members,
 from patroni.etcd import Etcd, Client
 from patroni.exceptions import PatroniCtlException
 from psycopg2 import OperationalError
-from requests.exceptions import ConnectionError
 from test_etcd import etcd_read, etcd_write, requests_get, socket_getaddrinfo, MockResponse
 from test_ha import get_cluster_initialized_without_leader, get_cluster_initialized_with_leader, \
     get_cluster_initialized_with_only_leader
@@ -335,9 +335,9 @@ leader''')
         assert cluster.leader.member.name == 'leader'
 
     def test_post_patroni(self):
-        with patch('requests.post', MagicMock(side_effect=ConnectionError('foo'))):
+        with patch('requests.post', MagicMock(side_effect=requests.exceptions.ConnectionError('foo'))):
             member = get_cluster_initialized_with_leader().leader.member
-            self.assertRaises(ConnectionError, post_patroni, member, 'dummy', {})
+            self.assertRaises(requests.exceptions.ConnectionError, post_patroni, member, 'dummy', {})
 
     def test_ctl(self):
         self.runner.invoke(ctl, ['list'])
diff --git a/tests/test_ha.py b/tests/test_ha.py
index cdf1156f..57754aa6 100644
--- a/tests/test_ha.py
+++ b/tests/test_ha.py
@@ -84,7 +84,7 @@ class TestHa(unittest.TestCase):
             self.p = Postgresql({'name': 'postgresql0', 'scope': 'dummy', 'listen': '127.0.0.1:5432',
                                  'data_dir': 'data/postgresql0', 'superuser': {}, 'admin': {},
                                  'replication': {'username': '', 'password': '', 'network': ''}})
-            self.p._state = 'running'
+            self.p.set_state('running')
             self.p._sysid = '1234567890'
             self.p.check_replication_lag = true
             self.p.can_create_replica_without_leader = MagicMock(return_value=False)
@@ -123,7 +123,7 @@ class TestHa(unittest.TestCase):
         self.p.is_healthy = false
         self.p.is_running = false
         self.ha.has_lock = true
-        self.p._role = 'master'
+        self.p.set_role('master')
         self.p.controldata = lambda: {'Database cluster state': 'in production'}
         self.assertEquals(self.ha.run_cycle(), 'started as readonly because i had the session lock')
         self.assertEquals(self.ha.run_cycle(), 'removed leader key after trying and failing to start postgres')
@@ -311,20 +311,20 @@ class TestHa(unittest.TestCase):
         self.ha.cluster = get_cluster_initialized_without_leader(failover=Failover(0, '', self.p.name, None))
         self.assertEquals(self.ha.run_cycle(), 'promoted self to leader by acquiring session lock')
         self.ha.cluster = get_cluster_initialized_without_leader(failover=Failover(0, '', 'leader', None))
-        self.p._role = 'replica'
+        self.p.set_role('replica')
         self.assertEquals(self.ha.run_cycle(), 'promoted self to leader by acquiring session lock')
         self.ha.fetch_node_status = lambda e: (e, True, True, 0, {})  # accessible, in_recovery
         self.assertEquals(self.ha.run_cycle(), 'following a different leader because i am not the healthiest node')
         self.ha.cluster = get_cluster_initialized_without_leader(failover=Failover(0, self.p.name, '', None))
         self.assertEquals(self.ha.run_cycle(), 'following a different leader because i am not the healthiest node')
         self.ha.fetch_node_status = lambda e: (e, False, True, 0, {})  # inaccessible, in_recovery
-        self.p._role = 'replica'
+        self.p.set_role('replica')
         self.assertEquals(self.ha.run_cycle(), 'promoted self to leader by acquiring session lock')
         # set failover flag to True for all members of the cluster
         # this should elect the current member, as we are not going to call the API for it.
         self.ha.cluster = get_cluster_initialized_without_leader(failover=Failover(0, '', 'other', None))
         self.ha.fetch_node_status = lambda e: (e, True, True, 0, {'nofailover': 'True'})  # accessible, in_recovery
-        self.p._role = 'replica'
+        self.p.set_role('replica')
         self.assertEquals(self.ha.run_cycle(), 'promoted self to leader by acquiring session lock')
         # same as previous, but set the current member to nofailover. In no case it should be elected as a leader
         self.ha.patroni.nofailover = True