diff --git a/client-cli/cli_lib/vm.py b/client-cli/cli_lib/vm.py
index e07057fb..d16a5958 100644
--- a/client-cli/cli_lib/vm.py
+++ b/client-cli/cli_lib/vm.py
@@ -340,7 +340,7 @@ def format_info(config, domain_information, long_output):
     ainformation.append('{}vCPUs:{}              {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['vcpu']))
     ainformation.append('{}Topology (S/C/T):{}   {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['vcpu_topology']))
 
-    if long_output == True:
+    if long_output is True:
         # Virtualization information
         ainformation.append('')
         ainformation.append('{}Emulator:{}           {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['emulator']))
@@ -435,7 +435,7 @@ def format_info(config, domain_information, long_output):
     ainformation.append('')
     ainformation.append('{}Networks:{}           {}'.format(ansiprint.purple(), ansiprint.end(), ', '.join(net_list)))
 
-    if long_output == True:
+    if long_output is True:
         # Disk list
         ainformation.append('')
         name_length = 0
diff --git a/client-cli/pvc.py b/client-cli/pvc.py
index 0fbfe569..07815ea2 100755
--- a/client-cli/pvc.py
+++ b/client-cli/pvc.py
@@ -145,7 +145,7 @@ if not os.path.isfile(store_path + '/pvc-cli.json'):
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=120)
 
 def cleanup(retcode, retmsg):
-    if retcode == True:
+    if retcode is True:
         if retmsg != '':
             click.echo(retmsg)
         exit(0)
@@ -692,7 +692,7 @@ def vm_modify(domain, cfgfile, editor, restart):
     dom_uuid = vm_information.get('uuid')
     dom_name = vm_information.get('name')
 
-    if editor == True:
+    if editor is True:
         # Grab the current config
         current_vm_cfg_raw = vm_information.get('xml')
         xml_data = etree.fromstring(current_vm_cfg_raw)
@@ -2897,7 +2897,7 @@ def provisioner_userdata_modify(name, filename, editor):
     if editor == False and filename == None:
         cleanup(False, 'Either a file or the "--editor" option must be specified.')
 
-    if editor == True:
+    if editor is True:
         # Grab the current config
         retcode, retdata = pvc_provisioner.userdata_info(config, name)
         if not retcode:
@@ -3076,7 +3076,7 @@ def provisioner_script_modify(name, filename, editor):
     if editor == False and filename == None:
         cleanup(False, 'Either a file or the "--editor" option must be specified.')
 
-    if editor == True:
+    if editor is True:
         # Grab the current config
         retcode, retdata = pvc_provisioner.script_info(config, name)
         if not retcode:
diff --git a/daemon-common/vm.py b/daemon-common/vm.py
index e358be1c..8ed2807c 100644
--- a/daemon-common/vm.py
+++ b/daemon-common/vm.py
@@ -730,7 +730,7 @@ def format_info(zk_conn, domain_information, long_output):
     ainformation.append('{}vCPUs:{}              {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['vcpu']))
     ainformation.append('{}Topology (S/C/T):{}   {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['vcpu_topology']))
 
-    if long_output == True:
+    if long_output is True:
         # Virtualization information
         ainformation.append('')
         ainformation.append('{}Emulator:{}           {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['emulator']))
@@ -804,7 +804,7 @@ def format_info(zk_conn, domain_information, long_output):
     ainformation.append('')
     ainformation.append('{}Networks:{}           {}'.format(ansiprint.purple(), ansiprint.end(), ', '.join(net_list)))
 
-    if long_output == True:
+    if long_output is True:
         # Disk list
         ainformation.append('')
         name_length = 0