diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2b26f1b6bc5c150767f73f1819eb7f829c18340d..3179e97463eb32847356107850cc471988a397c8 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1336,8 +1336,7 @@ class LUVerifyCluster(LogicalUnit):
     master_files = [constants.CLUSTER_CONF_FILE]
 
     file_names = ssconf.SimpleStore().GetFileList()
-    file_names.append(constants.SSL_CERT_FILE)
-    file_names.append(constants.RAPI_CERT_FILE)
+    file_names.extend(constants.ALL_CERT_FILES)
     file_names.extend(master_files)
 
     local_checksums = utils.FingerprintFiles(file_names)
diff --git a/lib/constants.py b/lib/constants.py
index 2789beac595e7c7f6031a8e8b840560b47ba1700..2977c647097340752943654c864d6a3a55abd583 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -114,6 +114,8 @@ SYSCONFDIR = _autoconf.SYSCONFDIR
 TOOLSDIR = _autoconf.TOOLSDIR
 CONF_DIR = SYSCONFDIR + "/ganeti"
 
+ALL_CERT_FILES = frozenset([SSL_CERT_FILE, RAPI_CERT_FILE])
+
 MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
 
 NODED = "ganeti-noded"