Index: uspace/app/taskbar/test/wndlist.c
===================================================================
--- uspace/app/taskbar/test/wndlist.c	(revision 3c54869a5b618845c19d4f6200ee90ac99a446aa)
+++ uspace/app/taskbar/test/wndlist.c	(revision 192019fb0f0f9643b1e1e705d014b5fe3f29d1e9)
@@ -139,4 +139,5 @@
 	ui_fixed_t *fixed = NULL;
 	wndlist_t *wndlist;
+	loc_srv_t *srv;
 
 	/* Set up a test WM service */
@@ -145,8 +146,8 @@
 
 	// FIXME This causes this test to be non-reentrant!
-	rc = loc_server_register(test_wndmgt_server);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-	rc = loc_service_register(test_wndmgt_svc, &sid);
+	rc = loc_server_register(test_wndmgt_server, &srv);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+	rc = loc_service_register(srv, test_wndmgt_svc, &sid);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -177,6 +178,7 @@
 	ui_destroy(ui);
 
-	rc = loc_service_unregister(sid);
-	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+	rc = loc_service_unregister(srv, sid);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+	loc_server_unregister(srv);
 }