diff --git a/lib/ansible/plugins/cache/base.py b/lib/ansible/plugins/cache/base.py
index 767964b281c..e903c935e49 100644
--- a/lib/ansible/plugins/cache/base.py
+++ b/lib/ansible/plugins/cache/base.py
@@ -20,11 +20,10 @@ __metaclass__ = type
 
 from abc import ABCMeta, abstractmethod
 
-from six import add_metaclass
+from six import with_metaclass
 
 
-@add_metaclass(ABCMeta)
-class BaseCacheModule:
+class BaseCacheModule(with_metaclass(ABCMeta, object)):
 
     @abstractmethod
     def get(self, key):
diff --git a/lib/ansible/plugins/connections/__init__.py b/lib/ansible/plugins/connections/__init__.py
index 70807b08f61..897bc58982b 100644
--- a/lib/ansible/plugins/connections/__init__.py
+++ b/lib/ansible/plugins/connections/__init__.py
@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from abc import ABCMeta, abstractmethod, abstractproperty
 
-from six import add_metaclass
+from six import with_metaclass
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
@@ -34,8 +34,7 @@ from ansible.utils.display import Display
 
 __all__ = ['ConnectionBase']
 
-@add_metaclass(ABCMeta)
-class ConnectionBase:
+class ConnectionBase(with_metaclass(ABCMeta, object)):
     '''
     A base class for connections to contain common code.
     '''
diff --git a/lib/ansible/plugins/inventory/__init__.py b/lib/ansible/plugins/inventory/__init__.py
index 03fd89429b4..74dbccc1bbc 100644
--- a/lib/ansible/plugins/inventory/__init__.py
+++ b/lib/ansible/plugins/inventory/__init__.py
@@ -23,10 +23,9 @@ __metaclass__ = type
 
 from abc import ABCMeta, abstractmethod
 
-from six import add_metaclass
+from six import with_metaclass
 
-@add_metaclass(ABCMeta)
-class InventoryParser:
+class InventoryParser(with_metaclass(ABCMeta, object)):
     '''Abstract Base Class for retrieving inventory information
 
     Any InventoryParser functions by taking an inven_source.  The caller then