diff --git a/testsuites/fstests/tftpfs/init.c b/testsuites/fstests/tftpfs/init.c
index 38e429f11e..3cf9112e2a 100644
--- a/testsuites/fstests/tftpfs/init.c
+++ b/testsuites/fstests/tftpfs/init.c
@@ -521,7 +521,7 @@ static int rdwt_tftp_client_file(
   void **tftp_handle
 )
 {
-  const static size_t buffer_size = 4001;
+  static const size_t buffer_size = 4001;
   char *data_buffer;
   int res = 0;
   ssize_t i;
diff --git a/testsuites/libtests/cpuuse/system.h b/testsuites/libtests/cpuuse/system.h
index 6ee404dd9a..4d7f03b646 100644
--- a/testsuites/libtests/cpuuse/system.h
+++ b/testsuites/libtests/cpuuse/system.h
@@ -93,7 +93,7 @@ struct taskSwitchLog {
 
 extern struct taskSwitchLog taskSwitchLog[];
 extern int taskSwitchLogIndex;
-volatile extern int testsFinished;
+extern volatile int testsFinished;
 
 
 /* end of include file */
diff --git a/testsuites/validation/tc-task-construct.c b/testsuites/validation/tc-task-construct.c
index 5a7ca4f497..61e4b9cf4d 100644
--- a/testsuites/validation/tc-task-construct.c
+++ b/testsuites/validation/tc-task-construct.c
@@ -472,7 +472,7 @@ static const char * const * const RtemsTaskReqConstruct_PreDesc[] = {
 
 typedef RtemsTaskReqConstruct_Context Context;
 
-static volatile _Thread_local int tls_object;
+_Thread_local static volatile int tls_object;
 
 #define MAX_TLS_SIZE RTEMS_ALIGN_UP( 128, RTEMS_TASK_STORAGE_ALIGNMENT )
 
diff --git a/testsuites/validation/tr-fatal-too-large-tls-size.c b/testsuites/validation/tr-fatal-too-large-tls-size.c
index 9bf5dcda97..b4660b4132 100644
--- a/testsuites/validation/tr-fatal-too-large-tls-size.c
+++ b/testsuites/validation/tr-fatal-too-large-tls-size.c
@@ -103,7 +103,7 @@ typedef struct {
 static AcfgValFatalTooLargeTlsSize_Context
   AcfgValFatalTooLargeTlsSize_Instance;
 
-static volatile _Thread_local uint8_t large_tls_object[ RTEMS_TASK_STORAGE_ALIGNMENT + 1 ];
+_Thread_local static volatile uint8_t large_tls_object[ RTEMS_TASK_STORAGE_ALIGNMENT + 1 ];
 
 static volatile bool shall_not_load_the_value;