diff --git a/cyborg/accelerator/drivers/pci/devspec.py b/cyborg/accelerator/drivers/pci/devspec.py
index 0e61ac07..91ad68a7 100644
--- a/cyborg/accelerator/drivers/pci/devspec.py
+++ b/cyborg/accelerator/drivers/pci/devspec.py
@@ -15,7 +15,6 @@ import abc
 import re
 import string
 
-import six
 
 from cyborg.accelerator.drivers.pci import utils
 from cyborg.common import exception
@@ -31,8 +30,7 @@ ANY = '*'
 REGEX_ANY = '.*'
 
 
-@six.add_metaclass(abc.ABCMeta)
-class PciAddressSpec(object):
+class PciAddressSpec(object, metaclass=abc.ABCMeta):
     """Abstract class for all PCI address spec styles
 
     This class checks the address fields of the pci.passthrough_whitelist
@@ -205,7 +203,7 @@ class WhitelistPciAddress(object):
 
     def _init_address_fields(self, pci_addr):
         if not self.is_physical_function:
-            if isinstance(pci_addr, six.string_types):
+            if isinstance(pci_addr, str):
                 self.pci_address_spec = PciAddressGlobSpec(pci_addr)
             elif isinstance(pci_addr, dict):
                 self.pci_address_spec = PciAddressRegexSpec(pci_addr)
diff --git a/cyborg/accelerator/drivers/pci/utils.py b/cyborg/accelerator/drivers/pci/utils.py
index 5ead8e5f..26e365dd 100644
--- a/cyborg/accelerator/drivers/pci/utils.py
+++ b/cyborg/accelerator/drivers/pci/utils.py
@@ -18,7 +18,6 @@ import re
 
 from oslo_concurrency import processutils
 from oslo_log import log as logging
-import six
 
 from cyborg.common import exception
 import cyborg.privsep
@@ -66,9 +65,9 @@ def pci_device_prop_match(pci_dev, specs):
                 # mismatch with the tags provided by users for port
                 # binding profile and the ones configured by operators
                 # with pci whitelist option.
-                if isinstance(v, six.string_types):
+                if isinstance(v, str):
                     v = v.lower()
-                if isinstance(pci_dev_v, six.string_types):
+                if isinstance(pci_dev_v, str):
                     pci_dev_v = pci_dev_v.lower()
                 if pci_dev_v != v:
                     return False