diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py
index 8fd56917..2ed1e08b 100644
--- a/hooks/nova_compute_utils.py
+++ b/hooks/nova_compute_utils.py
@@ -138,7 +138,6 @@ BASE_PACKAGES = [
     'nova-compute',
     'genisoimage',  # was missing as a package dependency until raring.
     'librbd1',  # bug 1440953
-    'python-six',
     'python-psutil',
     'xfsprogs',
     'nfs-common',
@@ -174,7 +173,6 @@ MULTIPATH_PACKAGES = [
 
 HELD_PACKAGES = [
     'python-memcache',
-    'python-six',
     'python-psutil',
 ]
 
diff --git a/requirements.txt b/requirements.txt
index 3b1cb7b1..03e9f9d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,6 @@ cryptography<3.4
 netaddr>0.7.16,<0.8.0
 
 Jinja2>=2.6  # BSD License (3 clause)
-six>=1.9.0
 
 dnspython
 
diff --git a/test-requirements.txt b/test-requirements.txt
index f3e0f0f0..e972406e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,6 @@
 #       all of its own requirements and if it doesn't, fix it there.
 #
 pyparsing<3.0.0  # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
-setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 requests>=2.18.4
 
diff --git a/unit_tests/test_actions_hugepagereport.py b/unit_tests/test_actions_hugepagereport.py
index d6b28721..9136bb09 100644
--- a/unit_tests/test_actions_hugepagereport.py
+++ b/unit_tests/test_actions_hugepagereport.py
@@ -50,6 +50,5 @@ class MainTestCase(CharmTestCase):
         self.assertEqual(len(dummy_action), 1)
         d = dummy_action[0]
         self.assertIsInstance(d, dict)
-        self.assert_('hugepagestats' in d)
-        self.assert_(
-            d['hugepagestats'].find('/free_hugepages') != -1)
+        self.assertIn('hugepagestats', d)
+        self.assertNotEqual(d['hugepagestats'].find('/free_hugepages'), -1)
diff --git a/unit_tests/test_nova_compute_contexts.py b/unit_tests/test_nova_compute_contexts.py
index db09d7e4..3fb8e8cc 100644
--- a/unit_tests/test_nova_compute_contexts.py
+++ b/unit_tests/test_nova_compute_contexts.py
@@ -573,8 +573,8 @@ class NovaComputeContextTests(CharmTestCase):
         self.test_config.set('enable-live-migration', True)
         self.test_config.set('migration-auth-type', 'ssh')
         self.os_release.return_value = 'kilo'
-        self.assertEquals(context.NovaComputeLibvirtContext()()[
-                          'live_migration_uri'], 'qemu+ssh://%s/system')
+        self.assertEqual(context.NovaComputeLibvirtContext()()[
+                         'live_migration_uri'], 'qemu+ssh://%s/system')
 
     def test_libvirt_context_with_migration_network(self):
         self.kv.return_value = FakeUnitdata(**{'host_uuid': self.host_uuid})
@@ -597,9 +597,9 @@ class NovaComputeContextTests(CharmTestCase):
         self.get_relation_ip.assert_called_with('migration',
                                                 cidr_network=None)
         self.assertTrue('live_migration_uri' not in libvirt_context.keys())
-        self.assertEquals(libvirt_context['live_migration_scheme'], 'ssh')
-        self.assertEquals(libvirt_context['live_migration_inbound_addr'],
-                          '10.5.0.5')
+        self.assertEqual(libvirt_context['live_migration_scheme'], 'ssh')
+        self.assertEqual(libvirt_context['live_migration_inbound_addr'],
+                         '10.5.0.5')
 
     def test_libvirt_bin_context_migration_tcp_listen_with_auto_converge(self):
         self.kv.return_value = FakeUnitdata(**{'host_uuid': self.host_uuid})