diff --git a/clustering/znode.py b/clustering/znode.py
index aff1cd1d224..6d01b869c58 100644
--- a/clustering/znode.py
+++ b/clustering/znode.py
@@ -194,7 +194,7 @@ def _get(self, path):
             for i in dir(zstat):
                 if not i.startswith('_'):
                     attr = getattr(zstat, i)
-                    if type(attr) in (int, str):
+                    if isinstance(attr, (int, str)):
                         stat_dict[i] = attr
             result = True, {'msg': 'The node was retrieved.', 'znode': path, 'value': value,
                             'stat': stat_dict}
diff --git a/network/nmcli.py b/network/nmcli.py
index 8078e9da4b1..00bab41760a 100644
--- a/network/nmcli.py
+++ b/network/nmcli.py
@@ -504,13 +504,13 @@ def dict_to_string(self, d):
             val=d[key]
             str_val=""
             add_string=True
-            if type(val)==type(dbus.Array([])):
+            if isinstance(val, dbus.Array):
                 for elt in val:
-                    if type(elt)==type(dbus.Byte(1)):
+                    if isinstance(elt, dbus.Byte):
                         str_val+="%s " % int(elt)
-                    elif type(elt)==type(dbus.String("")):
+                    elif isinstance(elt, dbus.String):
                         str_val+="%s" % elt
-            elif type(val)==type(dbus.Dictionary({})):
+            elif isinstance(val, dbus.Dictionary):
                 dstr+=self.dict_to_string(val)
                 add_string=False
             else:
diff --git a/system/osx_defaults.py b/system/osx_defaults.py
index a71cecbd7fe..7bec2b99640 100644
--- a/system/osx_defaults.py
+++ b/system/osx_defaults.py
@@ -238,7 +238,7 @@ def write(self):
                 value = "TRUE"
             else:
                 value = "FALSE"
-        elif type(self.value) is int or type(self.value) is float:
+        elif isinstance(self.value, (int, float)):
             value = str(self.value)
         elif self.array_add and self.current_value is not None:
             value = list(set(self.value) - set(self.current_value))
@@ -285,7 +285,7 @@ def run(self):
             return True
 
         # There is a type mismatch! Given type does not match the type in defaults
-        if self.current_value is not None and type(self.current_value) is not type(self.value):
+        if self.current_value is not None and not isinstance(self.current_value, type(self.value)):
             raise OSXDefaultsException("Type mismatch. Type in defaults: " + type(self.current_value).__name__)
 
         # Current value matches the given value. Nothing need to be done. Arrays need extra care