diff --git a/src/lib/charm/openstack/keystone_ldap.py b/src/lib/charm/openstack/keystone_ldap.py
index 239e038..55400f8 100644
--- a/src/lib/charm/openstack/keystone_ldap.py
+++ b/src/lib/charm/openstack/keystone_ldap.py
@@ -175,3 +175,18 @@ class KeystoneLDAPCharm(charms_openstack.charm.OpenStackCharm):
         if (hookenv.config('tls-ca-ldap') and
            os.path.exists(self.options.backend_ca_file)):
             os.unlink(self.options.backend_ca_file)
+
+
+class KeystoneLDAPCharmRocky(KeystoneLDAPCharm):
+
+    # First release supported
+    release = 'rocky'
+
+    # List of packages to install for this charm
+    # Explicitly install python3-ldap so python3-ldappool does not install
+    # python-ldap
+    packages = ['python3-ldap', 'python3-ldappool']
+
+    purge_packages = ['python-ldap', 'python-ldappool']
+
+    python_version = 3
diff --git a/src/tox.ini b/src/tox.ini
index 0e36e84..fc31006 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -35,7 +35,7 @@ commands =
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-queens --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-rocky --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)
diff --git a/unit_tests/test_keystone_ldap_handlers.py b/unit_tests/test_keystone_ldap_handlers.py
index b3018ce..e9cbb89 100644
--- a/unit_tests/test_keystone_ldap_handlers.py
+++ b/unit_tests/test_keystone_ldap_handlers.py
@@ -15,7 +15,7 @@ from __future__ import print_function
 import mock
 
 from charms_openstack.test_mocks import charmhelpers as ch
-ch.contrib.openstack.utils.OPENSTACK_RELEASES = ('mitaka', )
+ch.contrib.openstack.utils.OPENSTACK_RELEASES = ('mitaka', 'rocky')
 
 import reactive.keystone_ldap_handlers as handlers