diff --git a/run_tests.sh b/run_tests.sh
index 0f022708e..243421e97 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -197,7 +197,10 @@ TESTS="${TESTS} api.baremetal.admin.test_drivers"
 TESTS="${TESTS} TestManageQueue"
 
 # Cinder encrypted volumes
-TESTS="${TESTS} TestEncryptedCinderVolumes"
+# 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"
 
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest