diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 88c2c879a..9775ad9e4 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -63,8 +63,8 @@ class openstack_integration::cinder (
     debug               => true,
   }
   if $volume_encryption {
-    $keymgr_api_class           = 'cinder.keymgr.barbican.BarbicanKeyManager'
-    $keymgr_encryption_api_url  = "${::openstack_integration::config::base_url}:9311/v1"
+    $keymgr_api_class           = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'
+    $keymgr_encryption_api_url  = "${::openstack_integration::config::base_url}:9311"
     $keymgr_encryption_auth_url = "${::openstack_integration::config::keystone_auth_uri}/v3"
   } else {
     $keymgr_api_class           = undef
@@ -80,13 +80,12 @@ class openstack_integration::cinder (
     memcached_servers   => $::openstack_integration::config::memcached_servers,
   }
   class { '::cinder::api':
-    default_volume_type => 'BACKEND_1',
-    public_endpoint     => "${::openstack_integration::config::base_url}:8776",
-    service_name        => 'httpd',
-    # TODO(emilien) Re-enable later when things are stable again.
-    # keymgr_api_class           => $keymgr_api_class,
-    # keymgr_encryption_api_url  => $keymgr_encryption_api_url,
-    # keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
+    default_volume_type        => 'BACKEND_1',
+    public_endpoint            => "${::openstack_integration::config::base_url}:8776",
+    service_name               => 'httpd',
+    keymgr_api_class           => $keymgr_api_class,
+    keymgr_encryption_api_url  => $keymgr_encryption_api_url,
+    keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
   }
   include ::apache
   class { '::cinder::wsgi::apache':
diff --git a/run_tests.sh b/run_tests.sh
index b73bac8c4..e2384918c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -205,10 +205,7 @@ echo "api.baremetal.admin.test_drivers" >> /tmp/openstack/tempest/test-whitelist
 echo "v2.test_queues.TestManageQueue" >> /tmp/openstack/tempest/test-whitelist.txt
 
 # Cinder encrypted volumes
-# TODO(emilien) re-enable it when those 2 patches are merged:
-# - https://review.openstack.org/#/c/358670/
-# - https://review.openstack.org/#/c/359391/
-# TESTS="${TESTS} TestEncryptedCinderVolumes"
+TESTS="${TESTS} TestEncryptedCinderVolumes"
 
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest