diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index dec37dc1b58eb819cc523e48dd6b13f69e1bb12a..49451787086d53a8426d63e4fcc22cd601cb9466 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -478,12 +478,15 @@ def VerifyCluster(opts, args):
                                       verbose=opts.verbose,
                                       error_codes=opts.error_codes,
                                       debug_simulate_errors=simulate)
-    jex.QueueJob('group ' + group, op)
+    jex.QueueJob("group " + group, op)
 
   results = jex.GetResults()
   success &= compat.all(r[1][0] for r in results)
 
-  return (not success and 1 or 0)
+  if success:
+    return constants.EXIT_SUCCESS
+  else:
+    return constants.EXIT_FAILURE
 
 
 def VerifyDisks(opts, args):
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index bdcc2febab8a466c9d9c9215abcd816bf506190f..98a056c4f847af745070cb33be4910a41deb01f7 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1406,7 +1406,6 @@ class LUClusterVerifyConfig(NoHooksLU, _VerifyErrors):
   """Verifies the cluster config.
 
   """
-
   REQ_BGL = False
 
   def _VerifyHVP(self, hvp_data):
@@ -1492,7 +1491,6 @@ class LUClusterVerifyGroup(LogicalUnit, _VerifyErrors):
   """Verifies the status of a node group.
 
   """
-
   HPATH = "cluster-verify"
   HTYPE = constants.HTYPE_CLUSTER
   REQ_BGL = False