diff --git a/src/tests/servers/debug/DebugWindowTest.cpp b/src/tests/servers/debug/DebugWindowTest.cpp
new file mode 100644
index 0000000000..6500be56e4
--- /dev/null
+++ b/src/tests/servers/debug/DebugWindowTest.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2019, Adrien Destugues <pulkomandy@pulkomandy.tk>
+ * Distributed under terms of the MIT license.
+ */
+
+#include "DebugWindow.h"
+
+#include <Application.h>
+
+
+int main(void)
+{
+	BApplication app("application/x-vnd.haiku-debugwindowtest");
+	DebugWindow* window = new DebugWindow("test");
+	return window->Go();
+}
diff --git a/src/tests/servers/debug/Jamfile b/src/tests/servers/debug/Jamfile
index fdd2e98d56..de87ca543c 100644
--- a/src/tests/servers/debug/Jamfile
+++ b/src/tests/servers/debug/Jamfile
@@ -2,4 +2,14 @@ SubDir HAIKU_TOP src tests servers debug ;
 
 AddSubDirSupportedPlatforms libbe_test ;
 
+UseHeaders [ FDirName $(HAIKU_TOP) src servers debug ] ;
+UsePrivateHeaders shared ;
+
 BinCommand crashing_app : crashing_app.cpp ;
+
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers debug ] ;
+SimpleTest DebugWindow :
+	DebugWindow.cpp DebugWindowTest.cpp 
+	: be localestub shared
+	: debug_server.rdef
+;