diff --git a/tests/test_bloom/main.c b/tests/test_bloom/main.c
index f4feccc51fcb7712aac1a1993aa87a280d82dd9f..eb2a860d11527b780d8d124e4de7968eed79fb16 100644
--- a/tests/test_bloom/main.c
+++ b/tests/test_bloom/main.c
@@ -1,11 +1,23 @@
 /*
- * Copyright (C) 2013 Christian Mehlis <mehlis@inf.fu-berlin.de>
+ * Copyright (C) 2013 Freie Universität Berlin
  *
- * This file subject to the terms and conditions of the GNU Lesser General
+ * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  */
 
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Bloom filter test application
+ *
+ * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/tests/test_bloom_bytes/main.c b/tests/test_bloom_bytes/main.c
index c0daa092a7bd99725684e5f7e8397c3576d8ecde..1f13eda77310f820e812abe14d742d02d7b07aae 100644
--- a/tests/test_bloom_bytes/main.c
+++ b/tests/test_bloom_bytes/main.c
@@ -1,11 +1,23 @@
 /*
- * Copyright (C) 2013 Christian Mehlis <mehlis@inf.fu-berlin.de>
+ * Copyright (C) 2013 Freie Universität Berlin
  *
- * This file subject to the terms and conditions of the GNU Lesser General
+ * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  */
 
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Bloom filter test application
+ *
+ * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/tests/test_float/main.c b/tests/test_float/main.c
index 7d426691d0403707409280e692c80ef9960a3694..28b2ffe3e1a353b49659160ad63c1ede286c3426 100644
--- a/tests/test_float/main.c
+++ b/tests/test_float/main.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013 INRIA
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Float test application
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 #include <board.h>
 #include <math.h>
diff --git a/tests/test_hwtimer/main.c b/tests/test_hwtimer/main.c
index 86b0fe64c89ade21095637e04bd4ed66c7d479dc..26641306caf561300872e5fcfaa3610a43b626d6 100644
--- a/tests/test_hwtimer/main.c
+++ b/tests/test_hwtimer/main.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013 INRIA
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Hwtimer test application
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 
 #include "hwtimer.h"
diff --git a/tests/test_hwtimer_spin/main.c b/tests/test_hwtimer_spin/main.c
index 1a8ad2889c75c6a3785240d6b6a4689b7c8df63e..87a4c9501a4d435d6c1a8ab17e87d25431adbeb9 100644
--- a/tests/test_hwtimer_spin/main.c
+++ b/tests/test_hwtimer_spin/main.c
@@ -1,11 +1,23 @@
 /*
  * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
  *
- * This file subject to the terms and conditions of the GNU Lesser General
+ * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  */
 
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Hwtimer test application
+ *
+ * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 #include <limits.h>
 #include <stdlib.h>
diff --git a/tests/test_irq/main.c b/tests/test_irq/main.c
index 7b692d816d0f19459aa72ec15d51171e63de0bbf..dd79da70ce9cb6d66098722798e197cb9790e928 100644
--- a/tests/test_irq/main.c
+++ b/tests/test_irq/main.c
@@ -1,5 +1,21 @@
 /*
  * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief IRQ test application
+ *
+ * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ *
+ * @}
  */
 
 #include <stdio.h>
diff --git a/tests/test_nativenet/main.c b/tests/test_nativenet/main.c
index 1df12d0fac29569427e8ba4b8d08fc44704a44db..f7b8f8e9ec21b6c8503c5fa0f23a12f227b5f054 100644
--- a/tests/test_nativenet/main.c
+++ b/tests/test_nativenet/main.c
@@ -1,5 +1,21 @@
 /*
- * Copyright (C) 2013 Oliver Hahm <oliver.hahm@inria.fr>
+ * Copyright (C) 2013 INRIA
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Nativenet test application
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ *
+ * @}
  */
 
 #include <stdio.h>
diff --git a/tests/test_pnet/main.c b/tests/test_pnet/main.c
index 0dd4416b370a88c70252d0b60a99744662308e4b..9b523dff8f869621cab58bf678736f976e964090 100644
--- a/tests/test_pnet/main.c
+++ b/tests/test_pnet/main.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013 Freie Universität Berlin
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief PNet test application
+ *
+ * @author      Martin Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/test_semaphore/main.c b/tests/test_semaphore/main.c
index 4b03833d022b2d65e14182d541cbe260d1513f2d..8d782120ca157c5fcf6a0940a21a78de016f01c8 100644
--- a/tests/test_semaphore/main.c
+++ b/tests/test_semaphore/main.c
@@ -2,11 +2,24 @@
  * Copyright (C) 2013 Christian Mehlis <mehlis@inf.fu-berlin.de>
  * Copyright (C) 2013 René Kijewski <rene.kijewski@fu-berlin.de>
  *
- * This file subject to the terms and conditions of the GNU Lesser General
+ * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  */
 
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Semaphore test application
+ *
+ * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
+ * @author René Kijewski <rene.kijewski@fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 
 #include "thread.h"
diff --git a/tests/test_sha256/main.c b/tests/test_sha256/main.c
index 5e00a4e4e10b166fe48608e75a05868a069add76..20b2d6b5d2067057398b927dfcdc9d393cff3514 100644
--- a/tests/test_sha256/main.c
+++ b/tests/test_sha256/main.c
@@ -1,11 +1,23 @@
 /*
  * Copyright (C) 2013 Christian Mehlis <mehlis@inf.fu-berlin.de>
  *
- * This file subject to the terms and conditions of the GNU Lesser General
+ * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  */
 
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief SHA256 test application
+ *
+ * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test_shell/main.c b/tests/test_shell/main.c
index d1d82cfa1a7e296bf3fca2332b31d4ea212bf22e..e4e88071e06877f3e2fca765f67550e0d70be54c 100644
--- a/tests/test_shell/main.c
+++ b/tests/test_shell/main.c
@@ -1,25 +1,21 @@
 /*
- * main.c - Main function of the test_shell project.
  * Copyright (C) 2013 Kaspar Schleiser <kaspar@schleiser.de>
+ * Copyright (C) 2013 Freie Universität Berlin
  *
- * This source code is licensed under the LGPLv2 license,
- * See the file LICENSE for more details.
- *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
  */
 
 /**
  * @file
- * @internal
  * @brief       shows how to set up own and use the system shell commands.
  *              By typing help in the serial console, all the supported commands
  *              are listed.
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
- * @version     $Revision: 3855 $
  *
- * @note        $Id: main.c 3855 2013-09-04 17:00:33 kasmi $
  */
 
 #include <stdio.h>
diff --git a/tests/test_thread_basic/main.c b/tests/test_thread_basic/main.c
index 7ed7affa7a6c44d4d4c4783f02f302588ff979b5..582ef6c4547d3a198667adc58c1c93951a603b35 100644
--- a/tests/test_thread_basic/main.c
+++ b/tests/test_thread_basic/main.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013 INRIA
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Thread test application
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 #include <thread.h>
 #include <flags.h>
diff --git a/tests/test_thread_exit/main.c b/tests/test_thread_exit/main.c
index b7b179285f995519687123188d6bb0a299eec8b6..482414d8ee41c7195ce5b6b34a8bc2ce08f34836 100644
--- a/tests/test_thread_exit/main.c
+++ b/tests/test_thread_exit/main.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013 INRIA
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Thread test application
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 
 #include "thread.h"
diff --git a/tests/test_thread_msg/main.c b/tests/test_thread_msg/main.c
index e320bbcf6139ee056bbda16c3443cd309b5cdcd5..9b0f905b085777b302615e6e62f11584a3412a6c 100644
--- a/tests/test_thread_msg/main.c
+++ b/tests/test_thread_msg/main.c
@@ -1,11 +1,23 @@
 /*
  * Copyright (C) 2013 Christian Mehlis <mehlis@inf.fu-berlin.de>
  *
- * This file subject to the terms and conditions of the GNU Lesser General
+ * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  */
 
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Thread test application
+ *
+ * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 
 #include "thread.h"
diff --git a/tests/test_vtimer_msg/main.c b/tests/test_vtimer_msg/main.c
index ef5f902a2bac21c90571d59058ae83b893d97b8c..e857e2415cedb14296aeaa1cdd57ceec98f930f9 100644
--- a/tests/test_vtimer_msg/main.c
+++ b/tests/test_vtimer_msg/main.c
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2013 INRIA
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup tests
+ * @{
+ *
+ * @file
+ * @brief Thread test application
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
+ *
+ * @}
+ */
+
 #include <stdio.h>
 #include <time.h>