diff --git a/tests/test_bitarithm_timings/Makefile b/tests/bitarithm_timings/Makefile
similarity index 100%
rename from tests/test_bitarithm_timings/Makefile
rename to tests/bitarithm_timings/Makefile
diff --git a/tests/test_bitarithm_timings/main.c b/tests/bitarithm_timings/main.c
similarity index 100%
rename from tests/test_bitarithm_timings/main.c
rename to tests/bitarithm_timings/main.c
diff --git a/tests/test_bloom/Makefile b/tests/bloom/Makefile
similarity index 100%
rename from tests/test_bloom/Makefile
rename to tests/bloom/Makefile
diff --git a/tests/test_bloom/generate_sets.py b/tests/bloom/generate_sets.py
similarity index 100%
rename from tests/test_bloom/generate_sets.py
rename to tests/bloom/generate_sets.py
diff --git a/tests/test_bloom/main.c b/tests/bloom/main.c
similarity index 100%
rename from tests/test_bloom/main.c
rename to tests/bloom/main.c
diff --git a/tests/test_bloom/words.txt.gz b/tests/bloom/words.txt.gz
similarity index 100%
rename from tests/test_bloom/words.txt.gz
rename to tests/bloom/words.txt.gz
diff --git a/tests/test_bloom_bytes/Makefile b/tests/bloom_bytes/Makefile
similarity index 100%
rename from tests/test_bloom_bytes/Makefile
rename to tests/bloom_bytes/Makefile
diff --git a/tests/test_bloom_bytes/main.c b/tests/bloom_bytes/main.c
similarity index 100%
rename from tests/test_bloom_bytes/main.c
rename to tests/bloom_bytes/main.c
diff --git a/tests/test_coap/Makefile b/tests/coap/Makefile
similarity index 100%
rename from tests/test_coap/Makefile
rename to tests/coap/Makefile
diff --git a/tests/test_coap/main.c b/tests/coap/main.c
similarity index 100%
rename from tests/test_coap/main.c
rename to tests/coap/main.c
diff --git a/tests/test_disable_module/Makefile b/tests/disable_module/Makefile
similarity index 100%
rename from tests/test_disable_module/Makefile
rename to tests/disable_module/Makefile
diff --git a/tests/test_disable_module/main.c b/tests/disable_module/main.c
similarity index 100%
rename from tests/test_disable_module/main.c
rename to tests/disable_module/main.c
diff --git a/tests/test_float/Makefile b/tests/float/Makefile
similarity index 100%
rename from tests/test_float/Makefile
rename to tests/float/Makefile
diff --git a/tests/test_float/README.md b/tests/float/README.md
similarity index 100%
rename from tests/test_float/README.md
rename to tests/float/README.md
diff --git a/tests/test_float/main.c b/tests/float/main.c
similarity index 100%
rename from tests/test_float/main.c
rename to tests/float/main.c
diff --git a/tests/test_hwtimer/Makefile b/tests/hwtimer/Makefile
similarity index 100%
rename from tests/test_hwtimer/Makefile
rename to tests/hwtimer/Makefile
diff --git a/tests/test_hwtimer/main.c b/tests/hwtimer/main.c
similarity index 100%
rename from tests/test_hwtimer/main.c
rename to tests/hwtimer/main.c
diff --git a/tests/test_hwtimer/tests/test_hwtimer b/tests/hwtimer/tests/test_hwtimer
similarity index 100%
rename from tests/test_hwtimer/tests/test_hwtimer
rename to tests/hwtimer/tests/test_hwtimer
diff --git a/tests/test_hwtimer_spin/Makefile b/tests/hwtimer_spin/Makefile
similarity index 100%
rename from tests/test_hwtimer_spin/Makefile
rename to tests/hwtimer_spin/Makefile
diff --git a/tests/test_hwtimer_spin/main.c b/tests/hwtimer_spin/main.c
similarity index 100%
rename from tests/test_hwtimer_spin/main.c
rename to tests/hwtimer_spin/main.c
diff --git a/tests/test_hwtimer_wait/Makefile b/tests/hwtimer_wait/Makefile
similarity index 100%
rename from tests/test_hwtimer_wait/Makefile
rename to tests/hwtimer_wait/Makefile
diff --git a/tests/test_hwtimer_wait/main.c b/tests/hwtimer_wait/main.c
similarity index 100%
rename from tests/test_hwtimer_wait/main.c
rename to tests/hwtimer_wait/main.c
diff --git a/tests/test_ipc_pingpong/Makefile b/tests/ipc_pingpong/Makefile
similarity index 100%
rename from tests/test_ipc_pingpong/Makefile
rename to tests/ipc_pingpong/Makefile
diff --git a/tests/test_ipc_pingpong/main.c b/tests/ipc_pingpong/main.c
similarity index 100%
rename from tests/test_ipc_pingpong/main.c
rename to tests/ipc_pingpong/main.c
diff --git a/tests/test_ipc_pingpong/tests/01-test b/tests/ipc_pingpong/tests/01-test
similarity index 100%
rename from tests/test_ipc_pingpong/tests/01-test
rename to tests/ipc_pingpong/tests/01-test
diff --git a/tests/test_irq/Makefile b/tests/irq/Makefile
similarity index 100%
rename from tests/test_irq/Makefile
rename to tests/irq/Makefile
diff --git a/tests/test_irq/main.c b/tests/irq/main.c
similarity index 100%
rename from tests/test_irq/main.c
rename to tests/irq/main.c
diff --git a/tests/test_mutex_unlock_and_sleep/Makefile b/tests/mutex_unlock_and_sleep/Makefile
similarity index 100%
rename from tests/test_mutex_unlock_and_sleep/Makefile
rename to tests/mutex_unlock_and_sleep/Makefile
diff --git a/tests/test_mutex_unlock_and_sleep/main.c b/tests/mutex_unlock_and_sleep/main.c
similarity index 100%
rename from tests/test_mutex_unlock_and_sleep/main.c
rename to tests/mutex_unlock_and_sleep/main.c
diff --git a/tests/test_nativenet/Makefile b/tests/nativenet/Makefile
similarity index 100%
rename from tests/test_nativenet/Makefile
rename to tests/nativenet/Makefile
diff --git a/tests/test_nativenet/main.c b/tests/nativenet/main.c
similarity index 100%
rename from tests/test_nativenet/main.c
rename to tests/nativenet/main.c
diff --git a/tests/test_net_if/Makefile b/tests/net_if/Makefile
similarity index 100%
rename from tests/test_net_if/Makefile
rename to tests/net_if/Makefile
diff --git a/tests/test_net_if/main.c b/tests/net_if/main.c
similarity index 100%
rename from tests/test_net_if/main.c
rename to tests/net_if/main.c
diff --git a/tests/test_pipe/Makefile b/tests/pipe/Makefile
similarity index 100%
rename from tests/test_pipe/Makefile
rename to tests/pipe/Makefile
diff --git a/tests/test_pipe/main.c b/tests/pipe/main.c
similarity index 100%
rename from tests/test_pipe/main.c
rename to tests/pipe/main.c
diff --git a/tests/test_pnet/Makefile b/tests/pnet/Makefile
similarity index 100%
rename from tests/test_pnet/Makefile
rename to tests/pnet/Makefile
diff --git a/tests/test_pnet/main.c b/tests/pnet/main.c
similarity index 100%
rename from tests/test_pnet/main.c
rename to tests/pnet/main.c
diff --git a/tests/test_posix_semaphore/Makefile b/tests/posix_semaphore/Makefile
similarity index 100%
rename from tests/test_posix_semaphore/Makefile
rename to tests/posix_semaphore/Makefile
diff --git a/tests/test_posix_semaphore/main.c b/tests/posix_semaphore/main.c
similarity index 100%
rename from tests/test_posix_semaphore/main.c
rename to tests/posix_semaphore/main.c
diff --git a/tests/test_posix_sleep/Makefile b/tests/posix_sleep/Makefile
similarity index 100%
rename from tests/test_posix_sleep/Makefile
rename to tests/posix_sleep/Makefile
diff --git a/tests/test_posix_sleep/main.c b/tests/posix_sleep/main.c
similarity index 100%
rename from tests/test_posix_sleep/main.c
rename to tests/posix_sleep/main.c
diff --git a/tests/test_pthread/Makefile b/tests/pthread/Makefile
similarity index 100%
rename from tests/test_pthread/Makefile
rename to tests/pthread/Makefile
diff --git a/tests/test_pthread/main.c b/tests/pthread/main.c
similarity index 100%
rename from tests/test_pthread/main.c
rename to tests/pthread/main.c
diff --git a/tests/test_pthread_barrier/Makefile b/tests/pthread_barrier/Makefile
similarity index 100%
rename from tests/test_pthread_barrier/Makefile
rename to tests/pthread_barrier/Makefile
diff --git a/tests/test_pthread_barrier/main.c b/tests/pthread_barrier/main.c
similarity index 100%
rename from tests/test_pthread_barrier/main.c
rename to tests/pthread_barrier/main.c
diff --git a/tests/test_pthread_cleanup/Makefile b/tests/pthread_cleanup/Makefile
similarity index 100%
rename from tests/test_pthread_cleanup/Makefile
rename to tests/pthread_cleanup/Makefile
diff --git a/tests/test_pthread_cleanup/main.c b/tests/pthread_cleanup/main.c
similarity index 100%
rename from tests/test_pthread_cleanup/main.c
rename to tests/pthread_cleanup/main.c
diff --git a/tests/test_pthread_cleanup/tests/01-test b/tests/pthread_cleanup/tests/01-test
similarity index 100%
rename from tests/test_pthread_cleanup/tests/01-test
rename to tests/pthread_cleanup/tests/01-test
diff --git a/tests/test_pthread_condition_variable/Makefile b/tests/pthread_condition_variable/Makefile
similarity index 100%
rename from tests/test_pthread_condition_variable/Makefile
rename to tests/pthread_condition_variable/Makefile
diff --git a/tests/test_pthread_condition_variable/main.c b/tests/pthread_condition_variable/main.c
similarity index 100%
rename from tests/test_pthread_condition_variable/main.c
rename to tests/pthread_condition_variable/main.c
diff --git a/tests/test_pthread_cooperation/Makefile b/tests/pthread_cooperation/Makefile
similarity index 100%
rename from tests/test_pthread_cooperation/Makefile
rename to tests/pthread_cooperation/Makefile
diff --git a/tests/test_pthread_cooperation/main.c b/tests/pthread_cooperation/main.c
similarity index 100%
rename from tests/test_pthread_cooperation/main.c
rename to tests/pthread_cooperation/main.c
diff --git a/tests/test_pthread_rwlock/Makefile b/tests/pthread_rwlock/Makefile
similarity index 100%
rename from tests/test_pthread_rwlock/Makefile
rename to tests/pthread_rwlock/Makefile
diff --git a/tests/test_pthread_rwlock/main.c b/tests/pthread_rwlock/main.c
similarity index 100%
rename from tests/test_pthread_rwlock/main.c
rename to tests/pthread_rwlock/main.c
diff --git a/tests/test_queue_fairness/Makefile b/tests/queue_fairness/Makefile
similarity index 100%
rename from tests/test_queue_fairness/Makefile
rename to tests/queue_fairness/Makefile
diff --git a/tests/test_queue_fairness/main.c b/tests/queue_fairness/main.c
similarity index 100%
rename from tests/test_queue_fairness/main.c
rename to tests/queue_fairness/main.c
diff --git a/tests/test_queue_fairness/tests/01-test b/tests/queue_fairness/tests/01-test
similarity index 100%
rename from tests/test_queue_fairness/tests/01-test
rename to tests/queue_fairness/tests/01-test
diff --git a/tests/test_sha256/Makefile b/tests/sha256/Makefile
similarity index 100%
rename from tests/test_sha256/Makefile
rename to tests/sha256/Makefile
diff --git a/tests/test_sha256/main.c b/tests/sha256/main.c
similarity index 100%
rename from tests/test_sha256/main.c
rename to tests/sha256/main.c
diff --git a/tests/test_sha256/tests/01-test b/tests/sha256/tests/01-test
similarity index 100%
rename from tests/test_sha256/tests/01-test
rename to tests/sha256/tests/01-test
diff --git a/tests/test_shell/Makefile b/tests/shell/Makefile
similarity index 100%
rename from tests/test_shell/Makefile
rename to tests/shell/Makefile
diff --git a/tests/test_shell/ReadMe.txt b/tests/shell/ReadMe.txt
similarity index 100%
rename from tests/test_shell/ReadMe.txt
rename to tests/shell/ReadMe.txt
diff --git a/tests/test_shell/main.c b/tests/shell/main.c
similarity index 100%
rename from tests/test_shell/main.c
rename to tests/shell/main.c
diff --git a/tests/test_shell/tests/01-basic b/tests/shell/tests/01-basic
similarity index 100%
rename from tests/test_shell/tests/01-basic
rename to tests/shell/tests/01-basic
diff --git a/tests/test_shell/tests/02-unknown-command b/tests/shell/tests/02-unknown-command
similarity index 100%
rename from tests/test_shell/tests/02-unknown-command
rename to tests/shell/tests/02-unknown-command
diff --git a/tests/test_shell/tests/03-inputlength-regression b/tests/shell/tests/03-inputlength-regression
similarity index 100%
rename from tests/test_shell/tests/03-inputlength-regression
rename to tests/shell/tests/03-inputlength-regression
diff --git a/tests/test_struct_tm_utility/Makefile b/tests/struct_tm_utility/Makefile
similarity index 100%
rename from tests/test_struct_tm_utility/Makefile
rename to tests/struct_tm_utility/Makefile
diff --git a/tests/test_struct_tm_utility/main.c b/tests/struct_tm_utility/main.c
similarity index 100%
rename from tests/test_struct_tm_utility/main.c
rename to tests/struct_tm_utility/main.c
diff --git a/tests/test_thread_basic/Makefile b/tests/thread_basic/Makefile
similarity index 100%
rename from tests/test_thread_basic/Makefile
rename to tests/thread_basic/Makefile
diff --git a/tests/test_thread_basic/main.c b/tests/thread_basic/main.c
similarity index 100%
rename from tests/test_thread_basic/main.c
rename to tests/thread_basic/main.c
diff --git a/tests/test_thread_basic/tests/test_thread.py b/tests/thread_basic/tests/test_thread.py
similarity index 100%
rename from tests/test_thread_basic/tests/test_thread.py
rename to tests/thread_basic/tests/test_thread.py
diff --git a/tests/test_thread_cooperation/Makefile b/tests/thread_cooperation/Makefile
similarity index 100%
rename from tests/test_thread_cooperation/Makefile
rename to tests/thread_cooperation/Makefile
diff --git a/tests/test_thread_cooperation/main.c b/tests/thread_cooperation/main.c
similarity index 100%
rename from tests/test_thread_cooperation/main.c
rename to tests/thread_cooperation/main.c
diff --git a/tests/test_thread_exit/Makefile b/tests/thread_exit/Makefile
similarity index 100%
rename from tests/test_thread_exit/Makefile
rename to tests/thread_exit/Makefile
diff --git a/tests/test_thread_exit/main.c b/tests/thread_exit/main.c
similarity index 100%
rename from tests/test_thread_exit/main.c
rename to tests/thread_exit/main.c
diff --git a/tests/test_thread_exit/tests/hello-world b/tests/thread_exit/tests/hello-world
similarity index 100%
rename from tests/test_thread_exit/tests/hello-world
rename to tests/thread_exit/tests/hello-world
diff --git a/tests/test_thread_msg/Makefile b/tests/thread_msg/Makefile
similarity index 100%
rename from tests/test_thread_msg/Makefile
rename to tests/thread_msg/Makefile
diff --git a/tests/test_thread_msg/main.c b/tests/thread_msg/main.c
similarity index 100%
rename from tests/test_thread_msg/main.c
rename to tests/thread_msg/main.c
diff --git a/tests/test_thread_msg_block_w_queue/Makefile b/tests/thread_msg_block_w_queue/Makefile
similarity index 100%
rename from tests/test_thread_msg_block_w_queue/Makefile
rename to tests/thread_msg_block_w_queue/Makefile
diff --git a/tests/test_thread_msg_block_w_queue/main.c b/tests/thread_msg_block_w_queue/main.c
similarity index 100%
rename from tests/test_thread_msg_block_w_queue/main.c
rename to tests/thread_msg_block_w_queue/main.c
diff --git a/tests/test_thread_msg_block_wo_queue/Makefile b/tests/thread_msg_block_wo_queue/Makefile
similarity index 100%
rename from tests/test_thread_msg_block_wo_queue/Makefile
rename to tests/thread_msg_block_wo_queue/Makefile
diff --git a/tests/test_thread_msg_block_wo_queue/main.c b/tests/thread_msg_block_wo_queue/main.c
similarity index 100%
rename from tests/test_thread_msg_block_wo_queue/main.c
rename to tests/thread_msg_block_wo_queue/main.c
diff --git a/tests/test_thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
similarity index 100%
rename from tests/test_thread_msg_seq/Makefile
rename to tests/thread_msg_seq/Makefile
diff --git a/tests/test_thread_msg_seq/main.c b/tests/thread_msg_seq/main.c
similarity index 100%
rename from tests/test_thread_msg_seq/main.c
rename to tests/thread_msg_seq/main.c
diff --git a/tests/test_vtimer_msg/Makefile b/tests/vtimer_msg/Makefile
similarity index 100%
rename from tests/test_vtimer_msg/Makefile
rename to tests/vtimer_msg/Makefile
diff --git a/tests/test_vtimer_msg/main.c b/tests/vtimer_msg/main.c
similarity index 100%
rename from tests/test_vtimer_msg/main.c
rename to tests/vtimer_msg/main.c
diff --git a/tests/test_vtimer_msg_diff/Makefile b/tests/vtimer_msg_diff/Makefile
similarity index 100%
rename from tests/test_vtimer_msg_diff/Makefile
rename to tests/vtimer_msg_diff/Makefile
diff --git a/tests/test_vtimer_msg_diff/main.c b/tests/vtimer_msg_diff/main.c
similarity index 100%
rename from tests/test_vtimer_msg_diff/main.c
rename to tests/vtimer_msg_diff/main.c