Using GridDialectType seems to be a unnecessary indirection. SkipByGridDialect should use the actual GridDialect classes. Regarding the additional methods the GridDialectType enum offers - it might either be replaced by actual grid dialect metadata or the tests which use these methods can just be modified (the methods isDocumentStore and supportsQueries are used at most once).