diff --git a/testcases/kernel/syscalls/timer_settime/timer_settime01.c b/testcases/kernel/syscalls/timer_settime/timer_settime01.c
index 1d9d5e49bf8..6fa1e7487ac 100644
--- a/testcases/kernel/syscalls/timer_settime/timer_settime01.c
+++ b/testcases/kernel/syscalls/timer_settime/timer_settime01.c
@@ -65,7 +65,8 @@ static void clear_signal(void)
 	 * seconds of CPU time has been accumulated for the process and
 	 * thread specific clocks.
 	 */
-	while (!caught_signal);
+	while (!caught_signal)
+		;
 
 	if (caught_signal != SIGALRM) {
 		tst_res(TFAIL, "Received incorrect signal: %s",
diff --git a/testcases/kernel/syscalls/timer_settime/timer_settime02.c b/testcases/kernel/syscalls/timer_settime/timer_settime02.c
index 46caefe4f07..de8607619b6 100644
--- a/testcases/kernel/syscalls/timer_settime/timer_settime02.c
+++ b/testcases/kernel/syscalls/timer_settime/timer_settime02.c
@@ -29,7 +29,7 @@
 #include "tst_timer.h"
 
 static struct tst_its new_set, old_set;
-static struct tst_its *pnew_set = &new_set, *pold_set = &old_set, *null_set = NULL;
+static struct tst_its *pnew_set = &new_set, *pold_set = &old_set, *null_set;
 static void *faulty_set;
 static kernel_timer_t timer;
 static kernel_timer_t timer_inval = (kernel_timer_t)-1;
diff --git a/testcases/kernel/syscalls/timer_settime/timer_settime03.c b/testcases/kernel/syscalls/timer_settime/timer_settime03.c
index a828f63d371..005bcf4c54e 100644
--- a/testcases/kernel/syscalls/timer_settime/timer_settime03.c
+++ b/testcases/kernel/syscalls/timer_settime/timer_settime03.c
@@ -67,7 +67,7 @@ static void setup(void)
 	SAFE_CLOCK_GETRES(CLOCK_REALTIME, &realtime_resolution);
 
 	tst_res(TINFO, "CLOCK_REALTIME resolution %lins",
-	        (long)realtime_resolution.tv_nsec);
+		(long)realtime_resolution.tv_nsec);
 }
 
 static void run(void)
@@ -93,7 +93,9 @@ static void run(void)
 	spec.it_interval.tv_nsec = realtime_resolution.tv_nsec;
 
 	SAFE_TIMER_SETTIME(timer, TIMER_ABSTIME, &spec, NULL);
-	while (!handler_called);
+	while (!handler_called)
+		;
+
 	errno = saved_errno;
 
 	if (overrun == -1)