diff --git a/tests/presence/mockps.py b/tests/presence/mockps.py
index 725ba4a9..071f3d78 100755
--- a/tests/presence/mockps.py
+++ b/tests/presence/mockps.py
@@ -283,8 +283,9 @@ class TestPresenceService(dbus.service.Object):
     def RemoveBuddy(self, pubkey):
         pubkey = ''.join([chr(item) for item in pubkey])
         if self._buddies.has_key(pubkey):
-            del self._buddies[pubkey]
+            buddy = self._buddies[pubkey]
             self.BuddyDisappeared(buddy._object_path)
+            del self._buddies[pubkey]
             return
         raise NotFoundError("Buddy not found")