diff --git a/Source/charon/tests/event_queue_test.c b/Source/charon/testcases/event_queue_test.c
similarity index 100%
rename from Source/charon/tests/event_queue_test.c
rename to Source/charon/testcases/event_queue_test.c
diff --git a/Source/charon/tests/event_queue_test.h b/Source/charon/testcases/event_queue_test.h
similarity index 100%
rename from Source/charon/tests/event_queue_test.h
rename to Source/charon/testcases/event_queue_test.h
diff --git a/Source/charon/tests/generator_test.c b/Source/charon/testcases/generator_test.c
similarity index 100%
rename from Source/charon/tests/generator_test.c
rename to Source/charon/testcases/generator_test.c
diff --git a/Source/charon/tests/generator_test.h b/Source/charon/testcases/generator_test.h
similarity index 100%
rename from Source/charon/tests/generator_test.h
rename to Source/charon/testcases/generator_test.h
diff --git a/Source/charon/tests/ike_sa_id_test.c b/Source/charon/testcases/ike_sa_id_test.c
similarity index 100%
rename from Source/charon/tests/ike_sa_id_test.c
rename to Source/charon/testcases/ike_sa_id_test.c
diff --git a/Source/charon/tests/ike_sa_id_test.h b/Source/charon/testcases/ike_sa_id_test.h
similarity index 100%
rename from Source/charon/tests/ike_sa_id_test.h
rename to Source/charon/testcases/ike_sa_id_test.h
diff --git a/Source/charon/tests/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c
similarity index 100%
rename from Source/charon/tests/ike_sa_manager_test.c
rename to Source/charon/testcases/ike_sa_manager_test.c
diff --git a/Source/charon/tests/ike_sa_manager_test.h b/Source/charon/testcases/ike_sa_manager_test.h
similarity index 100%
rename from Source/charon/tests/ike_sa_manager_test.h
rename to Source/charon/testcases/ike_sa_manager_test.h
diff --git a/Source/charon/tests/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c
similarity index 100%
rename from Source/charon/tests/ike_sa_test.c
rename to Source/charon/testcases/ike_sa_test.c
diff --git a/Source/charon/tests/ike_sa_test.h b/Source/charon/testcases/ike_sa_test.h
similarity index 100%
rename from Source/charon/tests/ike_sa_test.h
rename to Source/charon/testcases/ike_sa_test.h
diff --git a/Source/charon/tests/job_queue_test.c b/Source/charon/testcases/job_queue_test.c
similarity index 100%
rename from Source/charon/tests/job_queue_test.c
rename to Source/charon/testcases/job_queue_test.c
diff --git a/Source/charon/tests/job_queue_test.h b/Source/charon/testcases/job_queue_test.h
similarity index 100%
rename from Source/charon/tests/job_queue_test.h
rename to Source/charon/testcases/job_queue_test.h
diff --git a/Source/charon/tests/linked_list_test.c b/Source/charon/testcases/linked_list_test.c
similarity index 100%
rename from Source/charon/tests/linked_list_test.c
rename to Source/charon/testcases/linked_list_test.c
diff --git a/Source/charon/tests/linked_list_test.h b/Source/charon/testcases/linked_list_test.h
similarity index 100%
rename from Source/charon/tests/linked_list_test.h
rename to Source/charon/testcases/linked_list_test.h
diff --git a/Source/charon/tests/packet_test.c b/Source/charon/testcases/packet_test.c
similarity index 100%
rename from Source/charon/tests/packet_test.c
rename to Source/charon/testcases/packet_test.c
diff --git a/Source/charon/tests/packet_test.h b/Source/charon/testcases/packet_test.h
similarity index 100%
rename from Source/charon/tests/packet_test.h
rename to Source/charon/testcases/packet_test.h
diff --git a/Source/charon/tests/parser_test.c b/Source/charon/testcases/parser_test.c
similarity index 100%
rename from Source/charon/tests/parser_test.c
rename to Source/charon/testcases/parser_test.c
diff --git a/Source/charon/tests/parser_test.h b/Source/charon/testcases/parser_test.h
similarity index 100%
rename from Source/charon/tests/parser_test.h
rename to Source/charon/testcases/parser_test.h
diff --git a/Source/charon/tests/receiver_test.c b/Source/charon/testcases/receiver_test.c
similarity index 100%
rename from Source/charon/tests/receiver_test.c
rename to Source/charon/testcases/receiver_test.c
diff --git a/Source/charon/tests/receiver_test.h b/Source/charon/testcases/receiver_test.h
similarity index 100%
rename from Source/charon/tests/receiver_test.h
rename to Source/charon/testcases/receiver_test.h
diff --git a/Source/charon/tests/scheduler_test.c b/Source/charon/testcases/scheduler_test.c
similarity index 100%
rename from Source/charon/tests/scheduler_test.c
rename to Source/charon/testcases/scheduler_test.c
diff --git a/Source/charon/tests/scheduler_test.h b/Source/charon/testcases/scheduler_test.h
similarity index 100%
rename from Source/charon/tests/scheduler_test.h
rename to Source/charon/testcases/scheduler_test.h
diff --git a/Source/charon/tests/send_queue_test.c b/Source/charon/testcases/send_queue_test.c
similarity index 100%
rename from Source/charon/tests/send_queue_test.c
rename to Source/charon/testcases/send_queue_test.c
diff --git a/Source/charon/tests/send_queue_test.h b/Source/charon/testcases/send_queue_test.h
similarity index 100%
rename from Source/charon/tests/send_queue_test.h
rename to Source/charon/testcases/send_queue_test.h
diff --git a/Source/charon/tests/sender_test.c b/Source/charon/testcases/sender_test.c
similarity index 100%
rename from Source/charon/tests/sender_test.c
rename to Source/charon/testcases/sender_test.c
diff --git a/Source/charon/tests/sender_test.h b/Source/charon/testcases/sender_test.h
similarity index 100%
rename from Source/charon/tests/sender_test.h
rename to Source/charon/testcases/sender_test.h
diff --git a/Source/charon/tests/socket_test.c b/Source/charon/testcases/socket_test.c
similarity index 100%
rename from Source/charon/tests/socket_test.c
rename to Source/charon/testcases/socket_test.c
diff --git a/Source/charon/tests/socket_test.h b/Source/charon/testcases/socket_test.h
similarity index 100%
rename from Source/charon/tests/socket_test.h
rename to Source/charon/testcases/socket_test.h
diff --git a/Source/charon/tests/thread_pool_test.c b/Source/charon/testcases/thread_pool_test.c
similarity index 100%
rename from Source/charon/tests/thread_pool_test.c
rename to Source/charon/testcases/thread_pool_test.c
diff --git a/Source/charon/tests/thread_pool_test.h b/Source/charon/testcases/thread_pool_test.h
similarity index 100%
rename from Source/charon/tests/thread_pool_test.h
rename to Source/charon/testcases/thread_pool_test.h
diff --git a/Source/charon/tests.c b/Source/charon/tests.c
index 20efb75ba..ba6ccf8c0 100644
--- a/Source/charon/tests.c
+++ b/Source/charon/tests.c
@@ -30,21 +30,21 @@
 #include "event_queue.h"
 #include "send_queue.h"
 #include "socket.h"
-#include "tests/linked_list_test.h"
-#include "tests/thread_pool_test.h"
-#include "tests/job_queue_test.h"
-#include "tests/event_queue_test.h"
-#include "tests/send_queue_test.h"
-#include "tests/socket_test.h"
-#include "tests/sender_test.h"
-#include "tests/scheduler_test.h"
-#include "tests/receiver_test.h"
-#include "tests/ike_sa_id_test.h"
-#include "tests/ike_sa_test.h"
-#include "tests/ike_sa_manager_test.h"
-#include "tests/generator_test.h"
-#include "tests/parser_test.h"
-#include "tests/packet_test.h"
+#include "testcases/linked_list_test.h"
+#include "testcases/thread_pool_test.h"
+#include "testcases/job_queue_test.h"
+#include "testcases/event_queue_test.h"
+#include "testcases/send_queue_test.h"
+#include "testcases/socket_test.h"
+#include "testcases/sender_test.h"
+#include "testcases/scheduler_test.h"
+#include "testcases/receiver_test.h"
+#include "testcases/ike_sa_id_test.h"
+#include "testcases/ike_sa_test.h"
+#include "testcases/ike_sa_manager_test.h"
+#include "testcases/generator_test.h"
+#include "testcases/parser_test.h"
+#include "testcases/packet_test.h"
 
 
 /* output for test messages */