diff --git a/.zuul.yaml b/.zuul.yaml
index 401f894acf..2fba6d0ecb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,7 +45,6 @@
         - telemetry-dsvm-integration-ipv6-only:
             irrelevant-files: *ceilometer-irrelevant-files
     gate:
-      queue: telemetry
       jobs:
         - grenade-ceilometer
         - telemetry-dsvm-integration-centos-8s:
diff --git a/ceilometer/agent.py b/ceilometer/agent.py
index 32423ed3ce..48e42b97bf 100644
--- a/ceilometer/agent.py
+++ b/ceilometer/agent.py
@@ -13,11 +13,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+import fnmatch
 import os
 import pkg_resources
 
 from oslo_log import log
-from oslo_utils import fnmatch
 import yaml
 
 LOG = log.getLogger(__name__)
diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py
index c018f651c5..c33a90e659 100644
--- a/ceilometer/event/converter.py
+++ b/ceilometer/event/converter.py
@@ -13,9 +13,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import fnmatch
+
 from oslo_config import cfg
 from oslo_log import log
-from oslo_utils import fnmatch
 from oslo_utils import timeutils
 import pkg_resources
 
diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py
index 9ff4204678..19d7d54b8c 100644
--- a/ceilometer/publisher/gnocchi.py
+++ b/ceilometer/publisher/gnocchi.py
@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from collections import defaultdict
+import fnmatch
 import hashlib
 import itertools
 import json
@@ -24,7 +25,6 @@ import uuid
 from gnocchiclient import exceptions as gnocchi_exc
 from keystoneauth1 import exceptions as ka_exceptions
 from oslo_log import log
-from oslo_utils import fnmatch
 from oslo_utils import timeutils
 from stevedore import extension
 from urllib import parse as urlparse