diff --git a/global-requirements.txt b/global-requirements.txt
index eec7d4fd5d..e40352d2b0 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -525,8 +525,7 @@ selenium  # Apache-2.0
 # situations as progressive releases of projects are done.
 # Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951
 # Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086
-# 46 & up contradicts with pyScss 1.3.4
-setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,!=46.0.0;python_version>='3.5'  # PSF/ZPL
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0;python_version>='3.5'  # PSF/ZPL
 setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,<45.0.0;python_version<='2.7'  # PSF/ZPL
 sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'  # BSD
 sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4'  # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 597992c515..2e078495fb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,6 @@ stestr>=1.0.0  # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 virtualenv>=14.0.6 # MIT
-setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0,!=46.0.0 # PSF/ZPL
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
 mock>=2.0.0 # BSD
 bashate>=0.5.1 # Apache-2.0
diff --git a/upper-constraints.txt b/upper-constraints.txt
index fc9a47ca87..d92c3ecd53 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -110,7 +110,7 @@ pysnmp===4.4.12
 sphinxcontrib-websupport===1.1.2;python_version=='2.7'
 Mako===1.1.2
 XStatic-angular-ui-router===0.3.1.2
-pyScss===1.3.4
+pyScss===1.3.6
 thriftpy2===0.4.11;python_version=='2.7'
 sphinxcontrib-htmlhelp===1.0.3;python_version=='3.6'
 sphinxcontrib-htmlhelp===1.0.3;python_version=='3.7'