diff --git a/testing/cxxtest/cxxtest_main.cxx b/testing/cxxtest/cxxtest_main.cxx
index 0d5a5f7ff..0e03a8604 100644
--- a/testing/cxxtest/cxxtest_main.cxx
+++ b/testing/cxxtest/cxxtest_main.cxx
@@ -1,5 +1,5 @@
 //***************************************************************************
-// testing/main.cxx
+// apps/testing/main.cxx
 //
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/irtest/Make.defs b/testing/irtest/Make.defs
index a20403a3d..d259bad43 100644
--- a/testing/irtest/Make.defs
+++ b/testing/irtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# testing/irtest/Make.defs
+# apps/testing/irtest/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/irtest/Makefile b/testing/irtest/Makefile
index 4a85180a1..b07e77cef 100644
--- a/testing/irtest/Makefile
+++ b/testing/irtest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# testing/irtest/Makefile
+# apps/testing/irtest/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/irtest/cmd.hpp b/testing/irtest/cmd.hpp
index 72dcb665e..aad7e01a6 100644
--- a/testing/irtest/cmd.hpp
+++ b/testing/irtest/cmd.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * testing/irtest/cmd.hpp
+ * apps/testing/irtest/cmd.hpp
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/ltp/Make.defs b/testing/ltp/Make.defs
index 34bde5166..a8e12b4c2 100644
--- a/testing/ltp/Make.defs
+++ b/testing/ltp/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# testing/ltp/Make.defs
+# apps/testing/ltp/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/ostest/pthread_cleanup.c b/testing/ostest/pthread_cleanup.c
index 75a83c522..21d38140e 100644
--- a/testing/ostest/pthread_cleanup.c
+++ b/testing/ostest/pthread_cleanup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * testing/ostest/pthread_cleanup.c
+ * apps/testing/ostest/pthread_cleanup.c
  *
  *   Copyright (C) 2017 Haltian Ltd. All rights reserved.
  *   Author: Juha Niskanen <juha.niskanen@haltian.com>
diff --git a/testing/ostest/pthread_rwlock_cancel.c b/testing/ostest/pthread_rwlock_cancel.c
index 538ea4f12..91b8a3a9c 100644
--- a/testing/ostest/pthread_rwlock_cancel.c
+++ b/testing/ostest/pthread_rwlock_cancel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * testing/ostest/pthread_rwlock_cancel.c
+ * apps/testing/ostest/pthread_rwlock_cancel.c
  *
  *   Copyright (C) 2017 Haltian Ltd. All rights reserved.
  *   Author: Juha Niskanen <juha.niskanen@haltian.com>
diff --git a/testing/sensortest/Make.defs b/testing/sensortest/Make.defs
index 3de46b106..df35dadf3 100644
--- a/testing/sensortest/Make.defs
+++ b/testing/sensortest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# testing/sensortest/Make.defs
+# apps/testing/sensortest/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/sensortest/Makefile b/testing/sensortest/Makefile
index 4130abe67..4f084f096 100644
--- a/testing/sensortest/Makefile
+++ b/testing/sensortest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# testing/sensortest/Makefile
+# apps/testing/sensortest/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/sensortest/sensortest.c b/testing/sensortest/sensortest.c
index c428432bf..f7dc6e2a1 100644
--- a/testing/sensortest/sensortest.c
+++ b/testing/sensortest/sensortest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * testing/sensortest.c
+ * apps/testing/sensortest.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/smart/smart_main.c b/testing/smart/smart_main.c
index fe7e3ee67..cee1d1073 100644
--- a/testing/smart/smart_main.c
+++ b/testing/smart/smart_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * testing/smart/smart_main.c
+ * apps/testing/smart/smart_main.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/testing/unity/Makefile b/testing/unity/Makefile
index 4976c4573..d59554f16 100644
--- a/testing/unity/Makefile
+++ b/testing/unity/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/ testing/unity/Makefile
+# apps/testing/unity/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with