diff --git a/requirements-py3.txt b/requirements-py3.txt
index d2bdfc6488..2b796c8299 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -30,7 +30,7 @@ oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
 oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
 oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
 oauthlib>=0.6
-pysaml2
+pysaml2<4.0.4
 dogpile.cache>=0.5.3
 jsonschema<3.0.0,>=2.0.0
 # pycadf tries to pull in eventlet
diff --git a/requirements.txt b/requirements.txt
index 2326962143..ce020503b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,7 @@ oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
 oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
 oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
 oauthlib>=0.6
-pysaml2
+pysaml2<4.0.4
 dogpile.cache>=0.5.3
 jsonschema<3.0.0,>=2.0.0
 pycadf<0.9.0,>=0.8.0
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index 4a35fb53bb..cc0227d9ae 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -29,6 +29,7 @@ pymongo<3.0,>=2.6.3
 
 
 
+
 # Testing
 # computes code coverage percentages
 coverage>=3.6