diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index a935deb54..8c71d7df8 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -391,7 +391,7 @@ void g_once_init_enter_leave_test()
     }
 
     gsize init_val2;
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     // cppcheck-suppress ignoredReturnValue
     g_once_init_enter(&init_val2);
 
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index de86d771c..27ab4d1f6 100644
--- a/test/cfg/posix.c
+++ b/test/cfg/posix.c
@@ -393,11 +393,11 @@ void uninitvar(int fd)
     // cppcheck-suppress uninitvar
     strtok(strtok_arg1, ";");
 
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     pthread_mutex_lock(&mutex1);
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     (void)pthread_mutex_trylock(&mutex2);
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     pthread_mutex_unlock(&mutex3);
     // after initialization it must be OK to call lock, trylock and unlock for this mutex
     pthread_mutex_init(&mutex, NULL);
@@ -489,7 +489,7 @@ void asctime_r_test(struct tm * tm, char * bufSizeUnknown)
     asctime_r(tm, bufSize100);
 
     // cppcheck-suppress asctime_rCalled
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     asctime_r(&tm_uninit_data, bufSize100);
     // cppcheck-suppress asctime_rCalled
     // cppcheck-suppress uninitvar
@@ -520,7 +520,7 @@ void ctime_r_test(time_t * timep, char * bufSizeUnknown)
     ctime_r(timep, bufSize100);
 
     // cppcheck-suppress ctime_rCalled
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     ctime_r(&time_t_uninit_data, bufSize100);
     // cppcheck-suppress ctime_rCalled
     // cppcheck-suppress uninitvar
diff --git a/test/cfg/std.c b/test/cfg/std.c
index 211ac393b..9388b0df1 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -1775,7 +1775,7 @@ void uninitvar_mbsrtowcs(wchar_t* d, const char** s, size_t m, mbstate_t *p)
 
     // cppcheck-suppress uninitvar
     (void)mbsrtowcs(dest,s,m,p);
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     (void)mbsrtowcs(d,&src,m,p);
     // cppcheck-suppress uninitvar
     (void)mbsrtowcs(d,s,max,p);
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index 33a3c8bb1..4b4666225 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -677,7 +677,7 @@ void uninitvar()
     SetLastError(dwordUninit);
 
     DWORD dwordUninit;
-    // cppcheck-suppress uninitvar
+    // TODO cppcheck-suppress uninitvar
     GetUserName(NULL, &dwordUninit);
 
     FILE *pFileUninit;