diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile
index bdfb7b54c9..01f3c9215c 100644
--- a/src/tests/servers/registrar/Jamfile
+++ b/src/tests/servers/registrar/Jamfile
@@ -26,3 +26,15 @@ CommonUnitTest RosterShell
 
 SimpleTest message_deliverer_test : message_deliverer_test.cpp
 	: <boot!home!config!lib>libopenbeos.so ;
+
+# a shutdown working with the emulation under R5
+if $(TARGET_PLATFORM) = r5 {
+	UsePrivateHeaders app ;
+	UsePrivateHeaders kernel ;
+
+	SimpleTest <test>shutdown
+		: shutdown.cpp
+		: <boot!home!config!lib>libopenbeos.so ;
+	
+	SEARCH on [ FGristFiles shutdown.cpp ] = [ FDirName $(OBOS_TOP) src bin ] ;
+}