diff --git a/gnocchi/tests/functional/gabbits/aggregates-with-metric-ids.yaml b/gnocchi/tests/functional/gabbits/aggregates-with-metric-ids.yaml
index ab9f6dfa0..5af23b458 100644
--- a/gnocchi/tests/functional/gabbits/aggregates-with-metric-ids.yaml
+++ b/gnocchi/tests/functional/gabbits/aggregates-with-metric-ids.yaml
@@ -645,7 +645,8 @@ tests:
         $.code: 400
         $.description.cause: "Invalid operations"
         $.description.reason: "/^Fail to parse the operations string/"
-        $.description.detail: /^Expected \'\)\', found end of text  \(at char 15\), \(line:1, col:16\)/
+        # TODO(tobias-urdin): Reenable this when https://github.com/pyparsing/pyparsing/issues/504 is fixed
+        #$.description.detail: /^Expected \'\)\', found end of text  \(at char 15\), \(line:1, col:16\)/
 
     - name: get invalid metric operations
       POST: /v1/aggregates
diff --git a/setup.cfg b/setup.cfg
index a7b572528..41ed981f2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,9 +49,7 @@ install_requires =
     Paste
     PasteDeploy
     daiquiri
-    # TODO(tobias-urdin): Evaluate unpin later
-    # https://github.com/pyparsing/pyparsing/issues/504
-    pyparsing>=2.2.0,<3.1.0
+    pyparsing>=2.2.0
     lz4>=0.9.0
     tooz>=1.38
     cachetools