diff --git a/test/mfs/configuration.xml b/test/mfs/configuration.xml
index bb2533c80..04997992a 100644
--- a/test/mfs/configuration.xml
+++ b/test/mfs/configuration.xml
@@ -14,7 +14,7 @@
           </brief>
           <copyright>
             <value><![CDATA[/*
-    ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test/nil/configuration.xml b/test/nil/configuration.xml
index 45d5a9841..9b98f3e72 100644
--- a/test/nil/configuration.xml
+++ b/test/nil/configuration.xml
@@ -14,7 +14,7 @@
           </brief>
           <copyright>
             <value><![CDATA[/*
-    ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/test/rt/configuration.xml b/test/rt/configuration.xml
index 2b789cc14..274d85811 100644
--- a/test/rt/configuration.xml
+++ b/test/rt/configuration.xml
@@ -14,7 +14,7 @@
           </brief>
           <copyright>
             <value><![CDATA[/*
-    ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -51,11 +51,11 @@
 /*
  * Stack size of test threads.
  */
-#if defined(CH_ARCHITECTURE_AVR) || defined(CH_ARCHITECTURE_MSP430)
+#if defined(PORT_ARCHITECTURE_AVR) || defined(PORT__ARCHITECTURE_MSP430)
 #define THREADS_STACK_SIZE      48
-#elif defined(CH_ARCHITECTURE_STM8)
+#elif defined(PORT__ARCHITECTURE_STM8)
 #define THREADS_STACK_SIZE      64
-#elif defined(CH_ARCHITECTURE_SIMIA32)
+#elif defined(PORT__ARCHITECTURE_SIMIA32)
 #define THREADS_STACK_SIZE      512
 #else
 #define THREADS_STACK_SIZE      128
diff --git a/test/rt/source/test/rt_test_root.h b/test/rt/source/test/rt_test_root.h
index 99ac4cc1c..6da777b22 100644
--- a/test/rt/source/test/rt_test_root.h
+++ b/test/rt/source/test/rt_test_root.h
@@ -67,11 +67,11 @@ extern "C" {
 /*
  * Stack size of test threads.
  */
-#if defined(CH_ARCHITECTURE_AVR) || defined(CH_ARCHITECTURE_MSP430)
+#if defined(PORT_ARCHITECTURE_AVR) || defined(PORT__ARCHITECTURE_MSP430)
 #define THREADS_STACK_SIZE      48
-#elif defined(CH_ARCHITECTURE_STM8)
+#elif defined(PORT__ARCHITECTURE_STM8)
 #define THREADS_STACK_SIZE      64
-#elif defined(CH_ARCHITECTURE_SIMIA32)
+#elif defined(PORT__ARCHITECTURE_SIMIA32)
 #define THREADS_STACK_SIZE      512
 #else
 #define THREADS_STACK_SIZE      128