diff --git a/src/tests/add-ons/input_server/Jamfile b/src/tests/add-ons/input_server/Jamfile
index ae14730aa5..76a6765dd0 100644
--- a/src/tests/add-ons/input_server/Jamfile
+++ b/src/tests/add-ons/input_server/Jamfile
@@ -10,7 +10,7 @@ SimpleTest TeamMonitorTest :
 	TeamMonitorTest.cpp
 	TeamMonitorWindow.cpp
 	TeamListItem.cpp
-	: be
+	: be localestub shared
 	;
 
 SEARCH on [ FGristFiles
diff --git a/src/tests/add-ons/input_server/TeamMonitorTest.cpp b/src/tests/add-ons/input_server/TeamMonitorTest.cpp
index a7dc762a1e..1511e2a632 100644
--- a/src/tests/add-ons/input_server/TeamMonitorTest.cpp
+++ b/src/tests/add-ons/input_server/TeamMonitorTest.cpp
@@ -22,8 +22,15 @@ main()
 {
 	BApplication app("application/x-vnd.tmwindow-test");
 	TeamMonitorWindow *window = new TeamMonitorWindow();
+
+	// The window should quit the app when it is done
+	window->SetFlags(window->Flags() | B_QUIT_ON_WINDOW_CLOSE);
 	window->Enable();
 
-	// we don't even quit when the window is closed...
+	// The window is designed to never quit unless this message was received.
+	// And in our case we would like it to quit.
+	BMessage message(SYSTEM_SHUTTING_DOWN);
+	window->PostMessage(&message);
+
 	app.Run();
 }