diff --git a/vitrage/datasources/driver_base.py b/vitrage/datasources/driver_base.py
index ccde833e7..84d07176d 100644
--- a/vitrage/datasources/driver_base.py
+++ b/vitrage/datasources/driver_base.py
@@ -13,7 +13,6 @@
 # under the License.
 
 import abc
-import six
 
 from oslo_log import log
 
@@ -24,8 +23,7 @@ from vitrage.utils import datetime as datetime_utils
 LOG = log.getLogger(__name__)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class DriverBase(object):
+class DriverBase(object, metaclass=abc.ABCMeta):
 
     _datasource_name = None
 
diff --git a/vitrage/datasources/transformer_base.py b/vitrage/datasources/transformer_base.py
index 711488b6b..d5beb43e3 100644
--- a/vitrage/datasources/transformer_base.py
+++ b/vitrage/datasources/transformer_base.py
@@ -15,7 +15,6 @@
 
 import abc
 from collections import namedtuple
-import six
 
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -99,8 +98,7 @@ def is_update_event(event):
     return event[DSProps.DATASOURCE_ACTION] == DatasourceAction.UPDATE
 
 
-@six.add_metaclass(abc.ABCMeta)
-class TransformerBase(object):
+class TransformerBase(object, metaclass=abc.ABCMeta):
 
     KEY_SEPARATOR = ':'
     QUERY_RESULT = 'graph_query_result'
diff --git a/vitrage/entity_graph/mappings/handler_base.py b/vitrage/entity_graph/mappings/handler_base.py
index 0207a15ec..b82c17710 100644
--- a/vitrage/entity_graph/mappings/handler_base.py
+++ b/vitrage/entity_graph/mappings/handler_base.py
@@ -14,11 +14,8 @@
 
 import abc
 
-import six
 
-
-@six.add_metaclass(abc.ABCMeta)
-class HandlerBase(object):
+class HandlerBase(object, metaclass=abc.ABCMeta):
 
     def __init__(self):
         pass
diff --git a/vitrage/entity_graph/processor/base.py b/vitrage/entity_graph/processor/base.py
index 277fd0e7d..9809a3540 100644
--- a/vitrage/entity_graph/processor/base.py
+++ b/vitrage/entity_graph/processor/base.py
@@ -14,11 +14,8 @@
 
 import abc
 
-import six
 
-
-@six.add_metaclass(abc.ABCMeta)
-class ProcessorBase(object):
+class ProcessorBase(object, metaclass=abc.ABCMeta):
 
     def __init__(self):
         pass
diff --git a/vitrage/evaluator/actions/recipes/base.py b/vitrage/evaluator/actions/recipes/base.py
index 9062f9173..dcc07ef2a 100644
--- a/vitrage/evaluator/actions/recipes/base.py
+++ b/vitrage/evaluator/actions/recipes/base.py
@@ -14,7 +14,6 @@
 
 import abc
 from collections import namedtuple
-import six
 
 
 ActionStepWrapper = namedtuple('ActionStepWrapper', ['type', 'params'])
@@ -23,8 +22,7 @@ ActionStepWrapper = namedtuple('ActionStepWrapper', ['type', 'params'])
 EVALUATOR_EVENT_TYPE = 'type'
 
 
-@six.add_metaclass(abc.ABCMeta)
-class Recipe(object):
+class Recipe(object, metaclass=abc.ABCMeta):
 
     @staticmethod
     @abc.abstractmethod
diff --git a/vitrage/evaluator/template_validation/content/base.py b/vitrage/evaluator/template_validation/content/base.py
index 74665934c..269f46eed 100644
--- a/vitrage/evaluator/template_validation/content/base.py
+++ b/vitrage/evaluator/template_validation/content/base.py
@@ -13,7 +13,6 @@
 # under the License.
 
 import abc
-import six
 
 from oslo_log import log
 from vitrage.evaluator.template_fields import TemplateFields
@@ -66,8 +65,7 @@ def get_template_schema(template):
         return get_content_fault_result(63), None
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ActionValidator(object):
+class ActionValidator(object, metaclass=abc.ABCMeta):
 
     @staticmethod
     @abc.abstractmethod
diff --git a/vitrage/graph/algo_driver/algorithm.py b/vitrage/graph/algo_driver/algorithm.py
index a411e7f39..206443728 100644
--- a/vitrage/graph/algo_driver/algorithm.py
+++ b/vitrage/graph/algo_driver/algorithm.py
@@ -15,15 +15,12 @@
 import abc
 from collections import namedtuple
 from osprofiler import profiler
-import six
 
 Mapping = \
     namedtuple('Mapping', ['subgraph_element', 'graph_element', 'is_vertex'])
 
 
-@six.add_metaclass(profiler.TracedMeta)
-@six.add_metaclass(abc.ABCMeta)
-class GraphAlgorithm(object):
+class GraphAlgorithm(object, metaclass=profiler.TracedMeta):
     __trace_args__ = {'name': 'graph',
                       'info': None,
                       'hide_args': False,
diff --git a/vitrage/graph/driver/graph.py b/vitrage/graph/driver/graph.py
index bf07d2492..7719e9b07 100644
--- a/vitrage/graph/driver/graph.py
+++ b/vitrage/graph/driver/graph.py
@@ -21,7 +21,6 @@ vitrage.graph.driver namespace.
 """
 import abc
 import copy
-import six
 
 from vitrage.graph.driver.elements import Edge
 from vitrage.graph.driver.elements import Vertex
@@ -34,8 +33,7 @@ class Direction(object):
     BOTH = 3
 
 
-@six.add_metaclass(abc.ABCMeta)
-class Graph(object):
+class Graph(object, metaclass=abc.ABCMeta):
     def __init__(self, name, graph_type, vertices=None, edges=None):
         """Create a Graph instance
 
diff --git a/vitrage/machine_learning/plugins/base.py b/vitrage/machine_learning/plugins/base.py
index 2bb9c3eec..83dfa9d63 100644
--- a/vitrage/machine_learning/plugins/base.py
+++ b/vitrage/machine_learning/plugins/base.py
@@ -13,11 +13,9 @@
 # under the License.
 
 import abc
-import six
 
 
-@six.add_metaclass(abc.ABCMeta)
-class MachineLearningBase(object):
+class MachineLearningBase(object, metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def process_event(self, data, event_type):
diff --git a/vitrage/notifier/plugins/base.py b/vitrage/notifier/plugins/base.py
index 248c870aa..81a887a9b 100644
--- a/vitrage/notifier/plugins/base.py
+++ b/vitrage/notifier/plugins/base.py
@@ -13,11 +13,9 @@
 # under the License.
 
 import abc
-import six
 
 
-@six.add_metaclass(abc.ABCMeta)
-class NotifierBase(object):
+class NotifierBase(object, metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def process_event(self, data, event_type):
diff --git a/vitrage/notifier/plugins/snmp/base.py b/vitrage/notifier/plugins/snmp/base.py
index 7c4c24db9..3fedf4cf5 100644
--- a/vitrage/notifier/plugins/snmp/base.py
+++ b/vitrage/notifier/plugins/snmp/base.py
@@ -13,11 +13,8 @@
 # under the License.
 import abc
 
-import six
 
-
-@six.add_metaclass(abc.ABCMeta)
-class SnmpSenderBase(object):
+class SnmpSenderBase(object, metaclass=abc.ABCMeta):
     """Abstract Vitrage snmp trap sender"""
 
     @abc.abstractmethod
diff --git a/vitrage/storage/base.py b/vitrage/storage/base.py
index ab5cae772..38d7023e2 100644
--- a/vitrage/storage/base.py
+++ b/vitrage/storage/base.py
@@ -13,11 +13,8 @@
 # under the License.
 import abc
 
-import six
 
-
-@six.add_metaclass(abc.ABCMeta)
-class Connection(object):
+class Connection(object, metaclass=abc.ABCMeta):
     """Base class for storage system connections."""
 
     def __init__(self, url):
@@ -64,8 +61,7 @@ class Connection(object):
         raise NotImplementedError('clear is not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ActiveActionsConnection(object):
+class ActiveActionsConnection(object, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def create(self, active_action):
         """Create a new action.
@@ -112,8 +108,7 @@ class ActiveActionsConnection(object):
         raise NotImplementedError('delete active actions is not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class WebhooksConnection(object):
+class WebhooksConnection(object, metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def create(self, webhook):
@@ -145,8 +140,7 @@ class WebhooksConnection(object):
         raise NotImplementedError('delete webhook is not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class TemplatesConnection(object):
+class TemplatesConnection(object, metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def create(self, template):
@@ -183,8 +177,7 @@ class TemplatesConnection(object):
         raise NotImplementedError('Delete Templates not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class EventsConnection(object):
+class EventsConnection(object, metaclass=abc.ABCMeta):
     def create(self, event):
         """Create a new event.
 
@@ -216,8 +209,7 @@ class EventsConnection(object):
         raise NotImplementedError('delete events is not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class GraphSnapshotsConnection(object):
+class GraphSnapshotsConnection(object, metaclass=abc.ABCMeta):
     def create(self, graph_snapshot):
         """Create a new graph snapshot.
 
@@ -244,8 +236,7 @@ class GraphSnapshotsConnection(object):
         raise NotImplementedError('delete graph snapshots not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class AlarmsConnection(object):
+class AlarmsConnection(object, metaclass=abc.ABCMeta):
     def create(self, alarm):
         raise NotImplementedError('create alarm not implemented')
 
@@ -259,8 +250,7 @@ class AlarmsConnection(object):
         raise NotImplementedError('delete alarms not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class EdgesConnection(object):
+class EdgesConnection(object, metaclass=abc.ABCMeta):
     def create(self, edge):
         raise NotImplementedError('create edge not implemented')
 
@@ -274,8 +264,7 @@ class EdgesConnection(object):
         raise NotImplementedError('delete edges not implemented')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ChangesConnection(object):
+class ChangesConnection(object, metaclass=abc.ABCMeta):
     def create(self, change):
         raise NotImplementedError('create change not implemented')