diff --git a/testcases/kernel/syscalls/add_key/add_key01.c b/testcases/kernel/syscalls/add_key/add_key01.c
index 1983e253833..d46d57e3a81 100644
--- a/testcases/kernel/syscalls/add_key/add_key01.c
+++ b/testcases/kernel/syscalls/add_key/add_key01.c
@@ -23,7 +23,7 @@ static char *logon_buf, *logon_buf1;
 static char *big_key_buf, *big_key_buf1;
 static unsigned int logon_nsup, big_key_nsup;
 
-struct tcase {
+static struct tcase {
 	const char *type;
 	const char *desc;
 	char **buf;
diff --git a/testcases/kernel/syscalls/add_key/add_key02.c b/testcases/kernel/syscalls/add_key/add_key02.c
index 98dd5b9058c..4d5a4ef773e 100644
--- a/testcases/kernel/syscalls/add_key/add_key02.c
+++ b/testcases/kernel/syscalls/add_key/add_key02.c
@@ -23,7 +23,7 @@
 #include "tst_test.h"
 #include "lapi/keyctl.h"
 
-struct tcase {
+static struct tcase {
 	const char *type;
 	size_t plen;
 } tcases[] = {
diff --git a/testcases/kernel/syscalls/add_key/add_key05.c b/testcases/kernel/syscalls/add_key/add_key05.c
index 74b0b54dddd..3abd58b833a 100644
--- a/testcases/kernel/syscalls/add_key/add_key05.c
+++ b/testcases/kernel/syscalls/add_key/add_key05.c
@@ -144,7 +144,7 @@ static void verify_max_bytes(void)
 static void verify_max_keys(void)
 {
 	int i, used_key, max_key;
-	char desc[10];
+	char desc[15];
 
 	tst_res(TINFO, "test max keys under unprivileged user");
 	parse_proc_key_users(&used_key, &max_key, NULL, NULL);
@@ -203,8 +203,6 @@ static void do_test(unsigned int n)
 
 	tst_reap_children();
 	useri++;
-
-	return;
 }
 
 static void cleanup(void)