diff --git a/src/conio/bitmap_con.c b/src/conio/bitmap_con.c
index d18a3fa0a4869d6261e68e182f2e093873239ef2..480a2e8dd163f4e5b8e2e6905fe2dffa1b651c91 100644
--- a/src/conio/bitmap_con.c
+++ b/src/conio/bitmap_con.c
@@ -1163,7 +1163,7 @@ int bitmap_setfont(int font, int force, int font_num)
 		old=malloc(ow*oh*sizeof(*old));
 		if(old) {
 			bitmap_vmem_gettext(1,1,ow,oh,old);
-			/* coverity[sleep]:SUPPRESS */
+			/* coverity[sleep:SUPPRESS] */
 			textmode(newmode);
 			new=malloc(ti.screenwidth*ti.screenheight*sizeof(*new));
 			if(!new) {
diff --git a/src/conio/x_events.c b/src/conio/x_events.c
index 93da663fdb4de8e48027ded2de17f342cbe8b76f..123894f037efd848d3bd1eca977fc2c4658f926a 100644
--- a/src/conio/x_events.c
+++ b/src/conio/x_events.c
@@ -1727,7 +1727,7 @@ x11_event(XEvent *ev)
 								if (x_cvstat.winwidth != w || x_cvstat.winheight != h) {
 									x_cvstat.winwidth = w;
 									x_cvstat.winheight = h;
-									// coverity[missing_lock]:SUPPRESS
+									// coverity[missing_lock:SUPPRESS]
 									x_cvstat.scaling = bitmap_double_mult_inside(w, h);
 									resize_xim();
 								}
@@ -2044,7 +2044,7 @@ x11_event(XEvent *ev)
 								handle_bios_key(&bios_key, &bios_key_parsing, &zero_first);
 							}
 							else {
-								// coverity[overflow_const]:SUPPRESS
+								// coverity[overflow_const:SUPPRESS]
 								bios_key *= 10;
 								bios_key += (ks - XK_KP_0);
 								break;
diff --git a/src/sftp/sftp_static.h b/src/sftp/sftp_static.h
index 7175396caa19fe10fdfe1b32c209a90babf155fd..3aa926a9d74250807f8379d677550440576c011e 100644
--- a/src/sftp/sftp_static.h
+++ b/src/sftp/sftp_static.h
@@ -60,8 +60,8 @@ static bool
 exit_function(SFTP_STATIC_TYPE state, bool retval)
 {
 	assert(state->running > 0);
+	// coverity[missing_lock:SUPPRESS]
 	state->running--;
-	// coverity[missing_lock]:SUPPRESS
 	pthread_mutex_unlock(&state->mtx);
 	return retval;
 }
diff --git a/src/syncterm/modem.c b/src/syncterm/modem.c
index 5426ab1e2ca7f98bc9b7ce033516eccc22af9ce3..78abb517c124de80df2dcf51344c5efce0f0c79c 100644
--- a/src/syncterm/modem.c
+++ b/src/syncterm/modem.c
@@ -86,7 +86,7 @@ modem_output_thread(void *args)
 			}
 			sent = 0;
 			while (com != COM_HANDLE_INVALID && sent < wr && !conn_api.terminate) {
-				// coverity[overlow]:SUPPRESS
+				// coverity[overlow:SUPPRESS]
 				ret = comWriteBuf(com, conn_api.wr_buf + sent, wr - sent);
 				if (ret > 0)
 					sent += ret;
diff --git a/src/syncterm/rlogin.c b/src/syncterm/rlogin.c
index a59a2b8de57c07aa1cf88bdf088f4e093987a6a1..ca1f3be7ccd7e56c53b0520952347fdf64d099f2 100644
--- a/src/syncterm/rlogin.c
+++ b/src/syncterm/rlogin.c
@@ -64,7 +64,7 @@ rlogin_output_thread(void *args)
 			sent = 0;
 			while (rlogin_sock != INVALID_SOCKET && sent < wr && !conn_api.terminate) {
 				if (socket_writable(rlogin_sock, 100)) {
-					// coverity[overflow]:SUPPRESS
+					// coverity[overflow:SUPPRESS]
 					ret = sendsocket(rlogin_sock, conn_api.wr_buf + sent, wr - sent);
 					if (ret > 0)
 						sent += ret;
diff --git a/src/syncterm/ssh.c b/src/syncterm/ssh.c
index 406f411c53d510b03e714c0bd6c5c84db087a424..5554687bf7f27185fcafffcebddd61b69ab5cec9 100644
--- a/src/syncterm/ssh.c
+++ b/src/syncterm/ssh.c
@@ -320,7 +320,7 @@ ssh_output_thread(void *args)
 
 	SetThreadName("SSH Output");
 	conn_api.output_thread_running = 1;
-	// coverity[thread1_checks_field]:SUPPRESS
+	// coverity[thread1_checks_field:SUPPRESS]
 	while (ssh_active && !conn_api.terminate && !channel_gone && !ssh_complete) {
 		pthread_mutex_lock(&(conn_outbuf.mutex));
 		wr = conn_buf_wait_bytes(&conn_outbuf, 1, 100);
diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c
index a194576c1f92dde5bc8fa4472bd5b3a5e27d6457..4ca1cb2d5cdd499f82a517e082751ea2afb0b0f5 100644
--- a/src/syncterm/syncterm.c
+++ b/src/syncterm/syncterm.c
@@ -778,12 +778,11 @@ static const struct {
 };
 
 char *output_types[] = {
+	/* coverity[missing_comma:SUPPRESS] */
 	"Autodetect"
 #ifdef __unix__
-	/* coverity[missing_comma] */
 	" (X11, SDL, Curses, ANSI)"
 #elif defined(_WIN32)
-	/* coverity[missing_comma] */
 	" (GDI, SDL, Console, ANSI)"
 #endif
 #ifdef __unix__
diff --git a/src/xpdev/xpbeep.c b/src/xpdev/xpbeep.c
index 574bddfeea38fc47fd4eb3d7b09c90265afae399..06f5594a2ce04bcd1f7922fe0f0e92998994e0d3 100644
--- a/src/xpdev/xpbeep.c
+++ b/src/xpdev/xpbeep.c
@@ -975,7 +975,7 @@ do_xp_play_sample(unsigned char *sampo, size_t sz, int *freed)
 	if (handle_type == SOUND_DEVICE_OSS) {
 		size_t wr = 0;
 		while (wr < sz) {
-			// coverity[overflow]:SUPPRESS
+			// coverity[overflow:SUPPRESS]
 			ssize_t i = write(dsp, samp + wr, sz - wr);
 			if (i >= 0)
 				wr += i;