diff --git a/.zuul.d/manila.yaml b/.zuul.d/manila.yaml
index 634b8c8..38da9b6 100644
--- a/.zuul.d/manila.yaml
+++ b/.zuul.d/manila.yaml
@@ -14,6 +14,8 @@
     parent: loci-base
     vars:
       project: manila
+      eol:
+        - ocata
     required-projects:
       - openstack/loci
       - openstack/requirements
diff --git a/scripts/requirements.sh b/scripts/requirements.sh
index 5cfba61..75f17fe 100755
--- a/scripts/requirements.sh
+++ b/scripts/requirements.sh
@@ -9,6 +9,9 @@ $(dirname $0)/install_packages.sh
 $(dirname $0)/clone_project.sh
 mv /tmp/requirements/{global-requirements.txt,upper-constraints.txt} /
 
+# workaround unicode issue with 44.1.1 setuptools on python2 and scandir 1.4
+[[ "${PYTHON3}" == "no" ]] && pip install -c /upper-constraints.txt scandir ||:
+
 # TODO: Make python-qpid-proton build here (possibly patch it)
 # or remove when python-qpid-proton is updated with build fix.
 #   https://issues.apache.org/jira/browse/PROTON-1381