diff --git a/src/kernel/apps/Jamfile b/src/kernel/apps/Jamfile
index 67d45d56b1..98be3d2bc6 100644
--- a/src/kernel/apps/Jamfile
+++ b/src/kernel/apps/Jamfile
@@ -28,7 +28,6 @@ if $(OBOS_ARCH) = x86 {
 	SubInclude OBOS_TOP src kernel apps cpuinfo ;
 }
 
-SubInclude OBOS_TOP src kernel apps consoled ;
 SubInclude OBOS_TOP src kernel apps echo ;
 SubInclude OBOS_TOP src kernel apps filetest ;
 SubInclude OBOS_TOP src kernel apps fortune ;
diff --git a/src/tests/kernel/Jamfile b/src/tests/kernel/Jamfile
index 18d91dba77..5571f50502 100644
--- a/src/tests/kernel/Jamfile
+++ b/src/tests/kernel/Jamfile
@@ -1,6 +1,7 @@
 SubDir OBOS_TOP src tests kernel ;
 
 SubInclude OBOS_TOP src tests kernel boot ;
+SubInclude OBOS_TOP src tests kernel consoled ;
 SubInclude OBOS_TOP src tests kernel core ;
 SubInclude OBOS_TOP src tests kernel libroot ;
 SubInclude OBOS_TOP src tests kernel benchmarks ;
diff --git a/src/kernel/apps/consoled/Jamfile b/src/tests/kernel/consoled/Jamfile
similarity index 76%
rename from src/kernel/apps/consoled/Jamfile
rename to src/tests/kernel/consoled/Jamfile
index 5a3efba4b6..04735590cb 100644
--- a/src/kernel/apps/consoled/Jamfile
+++ b/src/tests/kernel/consoled/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kernel apps consoled ;
+SubDir OBOS_TOP src tests kernel consoled ;
 
 UsePrivateHeaders kernel ;
 UseHeaders [ FDirName $(OBOS_TOP) src apps terminal MYOB ] ;
diff --git a/src/kernel/apps/consoled/consoled.cpp b/src/tests/kernel/consoled/consoled.cpp
similarity index 100%
rename from src/kernel/apps/consoled/consoled.cpp
rename to src/tests/kernel/consoled/consoled.cpp