diff --git a/tests/bitarithm_timings/Makefile b/tests/bitarithm_timings/Makefile
index 58406e236056a686e69787cea68a26096ecfdeb2..db6ae052224e101f81af655134313a517ba18755 100644
--- a/tests/bitarithm_timings/Makefile
+++ b/tests/bitarithm_timings/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_bitarithm_timings
+APPLICATION = bitarithm_timings
 include ../Makefile.tests_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/bloom/Makefile b/tests/bloom/Makefile
index fa279e8068130012a005887d36799cb5e7ca1f5c..3a368f86a77fe3ce9c87537e7d2bbfddc114ee44 100644
--- a/tests/bloom/Makefile
+++ b/tests/bloom/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_bloom
+APPLICATION = bloom
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := chronos mbed_lpc1768 msb-430 msb-430h redbee-econotag \
diff --git a/tests/bloom_bytes/Makefile b/tests/bloom_bytes/Makefile
index 79dafd71d0c080eab67426ccd504f6896a49ed21..ea88bac77ccb182dec54ea7c2294321f28eb904d 100644
--- a/tests/bloom_bytes/Makefile
+++ b/tests/bloom_bytes/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_bloom_bytes
+APPLICATION = bloom_bytes
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/coap/Makefile b/tests/coap/Makefile
index d01d91fe0f98910c04c5b253b61f4ae1b6d47df7..9ba1122569db6b02bc7107c67f264d3012689f0d 100644
--- a/tests/coap/Makefile
+++ b/tests/coap/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_coap
+APPLICATION = coap
 include ../Makefile.tests_common
 
 BOARD_BLACKLIST := arduino-due chronos mbed_lpc1768 msb-430 msb-430h qemu-i386 stm32f0discovery \
diff --git a/tests/disable_module/Makefile b/tests/disable_module/Makefile
index 1e3c426030a44165898827e9f36eae9d8f7e8242..e1bd58dbde7fd90cf0301bbc8f5fb41b355294f3 100644
--- a/tests/disable_module/Makefile
+++ b/tests/disable_module/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_disable_module
+APPLICATION = disable_module
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/float/Makefile b/tests/float/Makefile
index fc1b3d11c44d42ca74cac9ae038ccbafe90be1a7..09cdd4d62f16b34f522cc07a99af195bde25dbcb 100644
--- a/tests/float/Makefile
+++ b/tests/float/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_float
+APPLICATION = float
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/hwtimer/Makefile b/tests/hwtimer/Makefile
index 7685e1f594a90432cd3286eadb5050f5d20912b4..718805bb855a925080a61cdc30349ccc93ebb1f4 100644
--- a/tests/hwtimer/Makefile
+++ b/tests/hwtimer/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_hwtimer
+APPLICATION = hwtimer
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/hwtimer_spin/Makefile b/tests/hwtimer_spin/Makefile
index b76df3430ca8ac9db43d0422c9f50fb20a65c72f..45ec84be76eb3e80d0d128c4009d0965a1fa374d 100644
--- a/tests/hwtimer_spin/Makefile
+++ b/tests/hwtimer_spin/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_hwtimer_spin
+APPLICATION = hwtimer_spin
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/hwtimer_wait/Makefile b/tests/hwtimer_wait/Makefile
index e0fc75793b0048163254c4c7eea21edec34aa3f1..3ffd19ce83fd0a98113191ffb0365eda899eaa03 100644
--- a/tests/hwtimer_wait/Makefile
+++ b/tests/hwtimer_wait/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_hwtimer_wait
+APPLICATION = hwtimer_wait
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/ipc_pingpong/Makefile b/tests/ipc_pingpong/Makefile
index f53249e030ad3f710a9885ff7719ff9f805bd9b6..2a5fa824261b3068d023ccf409944ddc7813456a 100644
--- a/tests/ipc_pingpong/Makefile
+++ b/tests/ipc_pingpong/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_ipc_pingpong
+APPLICATION = ipc_pingpong
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/irq/Makefile b/tests/irq/Makefile
index 7acb1e919e5a22a7f417eababd12932524200bea..5b59ed8de986fbe786b35cb09a2e63c76015d2f5 100644
--- a/tests/irq/Makefile
+++ b/tests/irq/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_irq
+APPLICATION = irq
 include ../Makefile.tests_common
 
 USEMODULE += auto_init
diff --git a/tests/mutex_unlock_and_sleep/Makefile b/tests/mutex_unlock_and_sleep/Makefile
index b3b046ee9055da2063ae3f80cd893aff083e90cf..45824eaa4688ec2dfbe6359d35ff1128ce29ebcf 100644
--- a/tests/mutex_unlock_and_sleep/Makefile
+++ b/tests/mutex_unlock_and_sleep/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_mutex_unlock_and_sleep
+APPLICATION = mutex_unlock_and_sleep
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/nativenet/Makefile b/tests/nativenet/Makefile
index c324b67b1be17f3c8297edc81969fb72a6fcc93f..c869413b8e2cd229482973a884e3d7805e93489c 100644
--- a/tests/nativenet/Makefile
+++ b/tests/nativenet/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_nativenet
+APPLICATION = nativenet
 include ../Makefile.tests_common
 
 BOARD_WHITELIST := native
@@ -12,5 +12,5 @@ FORCE:
 	touch main.c
 
 sender: CFLAGS += -DSENDER
-sender: APPLICATION = test_nativenet_sender
+sender: APPLICATION = nativenet_sender
 sender: FORCE all
diff --git a/tests/net_if/Makefile b/tests/net_if/Makefile
index 3d3fb6883276ea447ad6f5e42e213cd8803b1176..b31d5334fc167a743457d96ccb7d39dc8ec330cc 100644
--- a/tests/net_if/Makefile
+++ b/tests/net_if/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_net_if
+APPLICATION = net_if
 
 BOARD_BLACKLIST = mbed_lpc1768 arduino-due udoo qemu-i386 stm32f0discovery stm32f4discovery
 # qemu-i386:        no transceiver, yet
diff --git a/tests/pipe/Makefile b/tests/pipe/Makefile
index 116521e3c00945182eb991f7127ab57ce10ebd1f..b1441bdfdb2ce9200abc3cb934501c7c073ed73e 100644
--- a/tests/pipe/Makefile
+++ b/tests/pipe/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_pipe
+APPLICATION = pipe
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/pnet/Makefile b/tests/pnet/Makefile
index 685a1d8553a69dced7f2630f24ebcf111f922dc8..9fd3a0271db5bf385c8839bc0b34ed7b0d02010e 100644
--- a/tests/pnet/Makefile
+++ b/tests/pnet/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_pnet
+APPLICATION = pnet
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := chronos msb-430h redbee-econotag telosb wsn430-v1_3b wsn430-v1_4 z1
diff --git a/tests/posix_semaphore/Makefile b/tests/posix_semaphore/Makefile
index 1c83872194d4dbbaac5d8e94b7c671e987039510..6a259e58bd1fd0e2bb7ecd967ec611cdcfb2f3ef 100644
--- a/tests/posix_semaphore/Makefile
+++ b/tests/posix_semaphore/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_posix_semaphore
+APPLICATION = posix_semaphore
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := msb-430 msb-430h mbed_lpc1768 redbee-econotag chronos stm32f0discovery
diff --git a/tests/posix_sleep/Makefile b/tests/posix_sleep/Makefile
index 7fd95590acfac796b429a71582d139400f3bea79..24f6fe6320a67adc82d547e80158441282b5dbdb 100644
--- a/tests/posix_sleep/Makefile
+++ b/tests/posix_sleep/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_posix_sleep
+APPLICATION = posix_sleep
 include ../Makefile.tests_common
 
 USEMODULE += posix
diff --git a/tests/pthread/Makefile b/tests/pthread/Makefile
index ab7e41554b1d6ab60b4ce5be46c46c28ec25d975..e6252668c74899abf859254f5d4ff7a713715b45 100644
--- a/tests/pthread/Makefile
+++ b/tests/pthread/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_pthread
+APPLICATION = pthread
 include ../Makefile.tests_common
 
 USEMODULE += posix
diff --git a/tests/pthread_barrier/Makefile b/tests/pthread_barrier/Makefile
index 215f8dcb934a6c343931e4184c96fd09daedc497..3f4cead1f7daf47265c019f8cc20155d2ca8587d 100644
--- a/tests/pthread_barrier/Makefile
+++ b/tests/pthread_barrier/Makefile
@@ -1,5 +1,5 @@
 # name of your application
-APPLICATION = test_pthread_barrier
+APPLICATION = pthread_barrier
 include ../Makefile.tests_common
 
 # exclude boards with insufficient RAM
diff --git a/tests/pthread_cleanup/Makefile b/tests/pthread_cleanup/Makefile
index f4bf56031ae52aed4eab43cc6a1f98a93c12b1e1..bbd94385d05b299191267f45b7dc42012b61a421 100644
--- a/tests/pthread_cleanup/Makefile
+++ b/tests/pthread_cleanup/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_pthread_cleanup
+APPLICATION = pthread_cleanup
 include ../Makefile.tests_common
 
 USEMODULE += pthread
diff --git a/tests/pthread_condition_variable/Makefile b/tests/pthread_condition_variable/Makefile
index ae8641783d68d5490db521efb85823e3e1caf027..6e53949643b334e42b196c456f7254f29fc529be 100644
--- a/tests/pthread_condition_variable/Makefile
+++ b/tests/pthread_condition_variable/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_condition_variable
+APPLICATION = condition_variable
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/pthread_cooperation/Makefile b/tests/pthread_cooperation/Makefile
index 396c0b0256e2e72e63b792797140dbe3cbb8d7e3..75665e6a48a9a804650c67de52bf9a05132408eb 100644
--- a/tests/pthread_cooperation/Makefile
+++ b/tests/pthread_cooperation/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_pthread_cooperation
+APPLICATION = pthread_cooperation
 include ../Makefile.tests_common
 
 USEMODULE += posix
diff --git a/tests/pthread_rwlock/Makefile b/tests/pthread_rwlock/Makefile
index 8ccd148a86869f0351a9fdfaa464636e076cfad2..0532eb7f0c1cb1faf0543045f724451a432d9bd0 100644
--- a/tests/pthread_rwlock/Makefile
+++ b/tests/pthread_rwlock/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_pthread_rwlock
+APPLICATION = pthread_rwlock
 include ../Makefile.tests_common
 
 USEMODULE += pthread
diff --git a/tests/queue_fairness/Makefile b/tests/queue_fairness/Makefile
index 81d4e6668518091dc2a9bc06ca51aa7db48b6596..79faedea89536fc0111e1948441eac88eac08def 100644
--- a/tests/queue_fairness/Makefile
+++ b/tests/queue_fairness/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_queue_fairness
+APPLICATION = queue_fairness
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := mbed_lpc1768 stm32f0discovery
diff --git a/tests/sha256/Makefile b/tests/sha256/Makefile
index e3457f2bd13ae33a8fc9aa5bd84227432d356425..d5a245e04a8c03c59e70ed4e26f8825cd4bdd185 100644
--- a/tests/sha256/Makefile
+++ b/tests/sha256/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_sha256
+APPLICATION = sha256
 include ../Makefile.tests_common
 
 USEMODULE += crypto
diff --git a/tests/shell/Makefile b/tests/shell/Makefile
index 94cfdd2ac42fbfbb9995613205121f48f9e2a0d5..083e92546e18a4f1a200060852117979ee8af81a 100644
--- a/tests/shell/Makefile
+++ b/tests/shell/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_shell
+APPLICATION = shell
 include ../Makefile.tests_common
 
 USEMODULE += shell
diff --git a/tests/struct_tm_utility/Makefile b/tests/struct_tm_utility/Makefile
index 89b1c69aa334d0720bd424c03291c760f9d6ab80..939dc0bd98859902d093afd7567149d36a20d5cc 100644
--- a/tests/struct_tm_utility/Makefile
+++ b/tests/struct_tm_utility/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_struct_tm_utility
+APPLICATION = struct_tm_utility
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/thread_basic/Makefile b/tests/thread_basic/Makefile
index b297276463139dc77746fc5193a75f45c8c4e886..60c4868abe54c26f443b7eb9c74cfd8c0e1193fa 100644
--- a/tests/thread_basic/Makefile
+++ b/tests/thread_basic/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_basic
+APPLICATION = thread_basic
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile
index c4c1fb1954eee369ee990e3b10e5c06ead1c4404..d45c04c7ab02d24aad08dacfa136499e81cae47c 100644
--- a/tests/thread_cooperation/Makefile
+++ b/tests/thread_cooperation/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_cooperation
+APPLICATION = thread_cooperation
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := chronos msb-430 msb-430h mbed_lpc1768 redbee-econotag stm32f0discovery
diff --git a/tests/thread_exit/Makefile b/tests/thread_exit/Makefile
index 25c8b8db2bb3c32aa0e69e65d804ef7706290eed..123859d3fc440be550cfee3f0aa87d712ec0c6dd 100644
--- a/tests/thread_exit/Makefile
+++ b/tests/thread_exit/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_exit
+APPLICATION = thread_exit
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile
index 9bfc17408c2f566296d5dfe31a1dd1202012db1b..d90b4e78cdd82084e3a39e2695425767ec507b65 100644
--- a/tests/thread_msg/Makefile
+++ b/tests/thread_msg/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_msg
+APPLICATION = thread_msg
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/thread_msg_block_w_queue/Makefile b/tests/thread_msg_block_w_queue/Makefile
index 9dd9e29a6105886a65f58a59d42a762483072148..5d09dab3af7ed2e4181f112dec8fe0a19bd87a06 100644
--- a/tests/thread_msg_block_w_queue/Makefile
+++ b/tests/thread_msg_block_w_queue/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_msg_block_w_queue
+APPLICATION = thread_msg_block_w_queue
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/thread_msg_block_wo_queue/Makefile b/tests/thread_msg_block_wo_queue/Makefile
index ecdac17974b521c9f9e67832a9e211ffb7c4efd5..23aa75948c78d6f036b886426e19cccc06aaff38 100644
--- a/tests/thread_msg_block_wo_queue/Makefile
+++ b/tests/thread_msg_block_wo_queue/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_msg_block_wo_queue
+APPLICATION = thread_msg_block_wo_queue
 include ../Makefile.tests_common
 
 DISABLE_MODULE += auto_init
diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
index 48773645aec8e768cf7b1619172dd66513a5cc59..17a77ef55a59e51999b96c0ac1fbe949799cf2ff 100644
--- a/tests/thread_msg_seq/Makefile
+++ b/tests/thread_msg_seq/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_thread_msg_seq
+APPLICATION = thread_msg_seq
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/vtimer_msg/Makefile b/tests/vtimer_msg/Makefile
index fc95d4304e3bcbb0b8b2c29d71451b30ab7c043d..2fa94799c0a4370dd8787a542a4bcdc9918e842d 100644
--- a/tests/vtimer_msg/Makefile
+++ b/tests/vtimer_msg/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_vtimer_msg
+APPLICATION = vtimer_msg
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
diff --git a/tests/vtimer_msg_diff/Makefile b/tests/vtimer_msg_diff/Makefile
index b7d6a2e18d6bc84e47e79466f134a9a71e5d7f1c..a6e40ef13bae76fa46d1e1ff8a1cb62fcee43d0a 100644
--- a/tests/vtimer_msg_diff/Makefile
+++ b/tests/vtimer_msg_diff/Makefile
@@ -1,4 +1,4 @@
-APPLICATION = test_vtimer_msg_diff
+APPLICATION = vtimer_msg_diff
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := mbed_lpc1768 stm32f0discovery