diff --git a/environment.yml b/environment.yml
index 15585405dc..4eabdd7b03 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,7 +5,7 @@ channels:
 
 dependencies:
   - cartopy
-  - cf-units>=3.0.0
+  - cf-units>=3.0.0,<3.1.0  # github.com/ESMValGroup/ESMValCore/issues/1655
   - cftime
   - compilers
   # 1.8.18/py39, they seem weary to build manylinux wheels
diff --git a/setup.py b/setup.py
index 4ee7e89dfd..9ab0e467f6 100755
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
     'install': [
         'cartopy',
         # see https://github.com/SciTools/cf-units/issues/218
-        'cf-units>=3.0.0,!=3.0.1.post0',
+        'cf-units>=3.0.0,<3.1.0,!=3.0.1.post0',  # ESMValCore/issues/1655
         'dask[array]',
         'esgf-pyclient>=0.3.1',
         'esmpy!=8.1.0',  # see github.com/ESMValGroup/ESMValCore/issues/1208