diff --git a/tests/unittests/tests-core/Makefile b/tests/unittests/tests-core/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2bb651c200c9f3062d56cb40133cd80ea309fe72
--- /dev/null
+++ b/tests/unittests/tests-core/Makefile
@@ -0,0 +1,3 @@
+MODULE = tests-core
+
+include $(RIOTBASE)/Makefile.base
diff --git a/tests/unittests/tests-core-atomic.c b/tests/unittests/tests-core/tests-core-atomic.c
similarity index 100%
rename from tests/unittests/tests-core-atomic.c
rename to tests/unittests/tests-core/tests-core-atomic.c
diff --git a/tests/unittests/tests-core-bitarithm.c b/tests/unittests/tests-core/tests-core-bitarithm.c
similarity index 100%
rename from tests/unittests/tests-core-bitarithm.c
rename to tests/unittests/tests-core/tests-core-bitarithm.c
diff --git a/tests/unittests/tests-core-cib.c b/tests/unittests/tests-core/tests-core-cib.c
similarity index 100%
rename from tests/unittests/tests-core-cib.c
rename to tests/unittests/tests-core/tests-core-cib.c
diff --git a/tests/unittests/tests-core-clist.c b/tests/unittests/tests-core/tests-core-clist.c
similarity index 100%
rename from tests/unittests/tests-core-clist.c
rename to tests/unittests/tests-core/tests-core-clist.c
diff --git a/tests/unittests/tests-core-lifo.c b/tests/unittests/tests-core/tests-core-lifo.c
similarity index 100%
rename from tests/unittests/tests-core-lifo.c
rename to tests/unittests/tests-core/tests-core-lifo.c
diff --git a/tests/unittests/tests-core-queue.c b/tests/unittests/tests-core/tests-core-queue.c
similarity index 100%
rename from tests/unittests/tests-core-queue.c
rename to tests/unittests/tests-core/tests-core-queue.c
diff --git a/tests/unittests/tests-core/tests-core.c b/tests/unittests/tests-core/tests-core.c
new file mode 100644
index 0000000000000000000000000000000000000000..205e1de77e8809cc6cf88b3928e4fe3535a7ef87
--- /dev/null
+++ b/tests/unittests/tests-core/tests-core.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2014 Martin Lenders
+ *
+ * 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.
+ */
+
+#include "tests-core.h"
+
+void tests_core(void)
+{
+    TESTS_RUN(tests_core_atomic_tests());
+    TESTS_RUN(tests_core_bitarithm_tests());
+    TESTS_RUN(tests_core_cib_tests());
+    TESTS_RUN(tests_core_clist_tests());
+    TESTS_RUN(tests_core_lifo_tests());
+    TESTS_RUN(tests_core_queue_tests());
+}
diff --git a/tests/unittests/tests-core.h b/tests/unittests/tests-core/tests-core.h
similarity index 92%
rename from tests/unittests/tests-core.h
rename to tests/unittests/tests-core/tests-core.h
index ddd96aceca81eac2e902a52519166a01afb50082..638b1cb2bed16e3eea4cef2f77069a94d878cafb 100644
--- a/tests/unittests/tests-core.h
+++ b/tests/unittests/tests-core/tests-core.h
@@ -18,7 +18,13 @@
  */
 #ifndef __TESTS_CORE_H_
 #define __TESTS_CORE_H_
-#include "embUnit/embUnit.h"
+
+#include "../unittests.h"
+
+/**
+ * @brief   The entry point of this test suite.
+ */
+void tests_core(void);
 
 /**
  * @brief   Generates tests atomic.h