diff --git a/.circleci/config.yml b/.circleci/config.yml
index dacb1ad8..43e3e5b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -118,8 +118,9 @@ refs:
     - run:
         name: Run Python tests
         environment:
-          # hpc report seems to fail with the default -N
-          GHCRTS: -N1
+          # Setting default number of threads to 2
+          # since circleci allocates 2 cpus per test container
+          GHCRTS: -N2
           HASURA_GRAPHQL_DATABASE_URL: 'postgres://gql_test:@localhost:5432/gql_test'
           HASURA_GRAPHQL_DATABASE_URL_2: 'postgres://gql_test:@localhost:5432/gql_test2'
           GRAPHQL_ENGINE: '/build/_server_output/graphql-engine'
diff --git a/.circleci/test-server.sh b/.circleci/test-server.sh
index 870460d5..8679a7a2 100755
--- a/.circleci/test-server.sh
+++ b/.circleci/test-server.sh
@@ -86,7 +86,12 @@ combine_all_hpc_reports() {
 			continue
 		fi
 		if [ -f "$combined_file" ]  ; then
+			GHCRTS_PREV="$GHCRTS"
+			# Unsetting GHCRTS as hpc combine fails if GCHRTS=-N2 is present
+			unset GHCRTS
 			(set -x && stack --allow-different-user exec -- hpc combine "$combined_file" "$tix_file" --union --output="$combined_file_intermediate" && set +x && mv "$combined_file_intermediate" "$combined_file" && rm "$tix_file" ) || true
+			# Restoring GHCRTS
+			export GHCRTS="$GHCRTS_PREV"
 		else
 			mv "$tix_file" "$combined_file" || true
 		fi
diff --git a/server/tests-py/test_graphql_queries.py b/server/tests-py/test_graphql_queries.py
index e9ebee2f..b4defe48 100644
--- a/server/tests-py/test_graphql_queries.py
+++ b/server/tests-py/test_graphql_queries.py
@@ -263,6 +263,7 @@ class TestGraphqlQueryPermissions(DefaultTestSelectQueries):
     def test_user_query_auction(self, hge_ctx, transport):
         check_query_f(hge_ctx, self.dir() + '/user_query_auction.yaml', transport)
 
+    @pytest.mark.xfail(reason="Refer https://github.com/hasura/graphql-engine-internal/issues/252")
     def test_jsonb_has_all(self, hge_ctx, transport):
         check_query_f(hge_ctx, self.dir() + '/jsonb_has_all.yaml', transport)