diff --git a/examples/antelope/shell/Makefile b/examples/antelope/shell/Makefile
index 5f9d144eb..c6ffd276b 100644
--- a/examples/antelope/shell/Makefile
+++ b/examples/antelope/shell/Makefile
@@ -1,7 +1,6 @@
 CONTIKI = ../../..
 
-MODULES += os/storage/antelope
-APPS += unit-test
+MODULES += os/storage/antelope os/services/unit-test
 
 all: shell-db
 
diff --git a/examples/cfs-coffee/Makefile b/examples/cfs-coffee/Makefile
index 71c9a8e0e..64b8f11b6 100644
--- a/examples/cfs-coffee/Makefile
+++ b/examples/cfs-coffee/Makefile
@@ -1,6 +1,8 @@
 DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI = ../..
 
+MODULES += os/services/unit-test
+
 all: test-cfs test-coffee example-coffee
 
 include $(CONTIKI)/Makefile.include
diff --git a/apps/unit-test/example-test.c b/os/services/unit-test/example-test.c
similarity index 100%
rename from apps/unit-test/example-test.c
rename to os/services/unit-test/example-test.c
diff --git a/apps/unit-test/unit-test.c b/os/services/unit-test/unit-test.c
similarity index 100%
rename from apps/unit-test/unit-test.c
rename to os/services/unit-test/unit-test.c
diff --git a/apps/unit-test/unit-test.h b/os/services/unit-test/unit-test.h
similarity index 100%
rename from apps/unit-test/unit-test.h
rename to os/services/unit-test/unit-test.h
diff --git a/regression-tests/07-base/code/Makefile b/regression-tests/07-base/code/Makefile
index 2445ab386..3bb2e989f 100644
--- a/regression-tests/07-base/code/Makefile
+++ b/regression-tests/07-base/code/Makefile
@@ -1,7 +1,7 @@
 all: test-ringbufindex
 
 CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"
-APPS    += unit-test
+MODULES += os/services/unit-test
 
 CONTIKI = ../../..
 CONTIKI_WITH_IPV6 = 1
diff --git a/regression-tests/07-base/code/test-ringbufindex.c b/regression-tests/07-base/code/test-ringbufindex.c
index 77bc054a9..f365cbfa9 100644
--- a/regression-tests/07-base/code/test-ringbufindex.c
+++ b/regression-tests/07-base/code/test-ringbufindex.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 #include "contiki.h"
-#include "unit-test.h"
+#include "unit-test/unit-test.h"
 
 #include "lib/ringbufindex.h"
 
diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile b/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile
index 22aeaf344..71532d502 100644
--- a/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile
+++ b/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile
@@ -1,8 +1,7 @@
 all:
 
 CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"
-APPS    += unit-test
-MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop
+MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop os/services/unit-test
 
 PROJECT_SOURCEFILES += common.c
 
diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/common.c b/regression-tests/13-ieee802154/code-flush-nbr-queue/common.c
index 51fd1fbfb..4baf17451 100644
--- a/regression-tests/13-ieee802154/code-flush-nbr-queue/common.c
+++ b/regression-tests/13-ieee802154/code-flush-nbr-queue/common.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "unit-test.h"
+#include "unit-test/unit-test.h"
 #include "common.h"
 
 #include "lib/simEnvChange.h"
diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c b/regression-tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c
index 6af9c156c..9045f77e4 100644
--- a/regression-tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c
+++ b/regression-tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c
@@ -40,7 +40,7 @@
 #include "net/mac/tsch/tsch.h"
 #include "net/mac/tsch/tsch-queue.h"
 
-#include "unit-test.h"
+#include "unit-test/unit-test.h"
 #include "common.h"
 
 PROCESS(test_process, "tsch_queue_flush_nbr_queue() test");
diff --git a/regression-tests/13-ieee802154/code/Makefile b/regression-tests/13-ieee802154/code/Makefile
index c0f3d160c..95f0498db 100644
--- a/regression-tests/13-ieee802154/code/Makefile
+++ b/regression-tests/13-ieee802154/code/Makefile
@@ -1,7 +1,6 @@
 all: test-panid-handling test-tcsh-create-packet
 
-APPS    += unit-test
-MODULES += os/net/mac/tsch
+MODULES += os/net/mac/tsch os/services/unit-test
 CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"
 
 WITH_TSCH        ?= 0
diff --git a/regression-tests/13-ieee802154/code/test-panid-handling.c b/regression-tests/13-ieee802154/code/test-panid-handling.c
index dd9b73304..da14fd0c6 100644
--- a/regression-tests/13-ieee802154/code/test-panid-handling.c
+++ b/regression-tests/13-ieee802154/code/test-panid-handling.c
@@ -30,7 +30,7 @@
  */
 
 #include "contiki.h"
-#include "unit-test.h"
+#include "unit-test/unit-test.h"
 #include "net/mac/framer/frame802154.h"
 
 #include <stdio.h>
diff --git a/regression-tests/13-ieee802154/code/test-tsch-packet.c b/regression-tests/13-ieee802154/code/test-tsch-packet.c
index 136405315..fed5564dc 100644
--- a/regression-tests/13-ieee802154/code/test-tsch-packet.c
+++ b/regression-tests/13-ieee802154/code/test-tsch-packet.c
@@ -30,7 +30,7 @@
  */
 
 #include "contiki.h"
-#include "unit-test.h"
+#include "unit-test/unit-test.h"
 #include "net/linkaddr.h"
 #include "net/mac/tsch/tsch.h"
 #include "net/mac/tsch/tsch-asn.h"