diff --git a/lib/pavilion/unittest.py b/lib/pavilion/unittest.py
index 79de74eae..8c386e85c 100644
--- a/lib/pavilion/unittest.py
+++ b/lib/pavilion/unittest.py
@@ -143,18 +143,14 @@ def __getattribute__(self, item):
             if self.SKIP:
                 for skip_glob in self.SKIP:
                     skip_glob = skip_glob.lower()
-                    if (fnmatch.fnmatch(name, skip_glob) or
-                            fnmatch.fnmatch(cname, skip_glob) or
-                            fnmatch.fnmatch(fname, skip_glob)):
+                    if any([skip_glob in nom for nom in (name, cname, fname)]):
                         return unittest.skip("via cmdline")(attr)
                 return attr
 
             if self.ONLY:
                 for only_glob in self.ONLY:
                     only_glob = only_glob.lower()
-                    if (fnmatch.fnmatch(name, only_glob) or
-                            fnmatch.fnmatch(cname, only_glob) or
-                            fnmatch.fnmatch(fname, only_glob)):
+                    if any([only_glob in nom for nom in (name, cname, fname)]):
                         return attr
                 return unittest.skip("via cmdline")(attr)