3 files changed, 12 insertions, 6 deletions
diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp
index 777030c17f5..27548455745 100644
--- a/cpp/test/Ice/servantLocator/Collocated.cpp
+++ b/cpp/test/Ice/servantLocator/Collocated.cpp
@@ -61,8 +61,10 @@ public:
         }
         else
         {
-            current.adapter->removeServantLocator("");
-            current.adapter->removeServantLocator("category");
+            ServantLocatorPtr locator = current.adapter->removeServantLocator("");
+            locator->deactivate("");
+            locator = current.adapter->removeServantLocator("category");
+            locator->deactivate("category");
         }
     }
 };
diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp
index 3fd46e6af54..3aeec31ef5f 100644
--- a/cpp/test/Ice/servantLocator/Server.cpp
+++ b/cpp/test/Ice/servantLocator/Server.cpp
@@ -60,8 +60,10 @@ public:
         }
         else
         {
-            current.adapter->removeServantLocator("");
-            current.adapter->removeServantLocator("category");
+            ServantLocatorPtr locator = current.adapter->removeServantLocator("");
+            locator->deactivate("");
+            locator = current.adapter->removeServantLocator("category");
+            locator->deactivate("category");
         }
     }
 };
diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp
index 0f7a8788896..bcbbfc94fed 100644
--- a/cpp/test/Ice/servantLocator/ServerAMD.cpp
+++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp
@@ -60,8 +60,10 @@ public:
         }
         else
         {
-            current.adapter->removeServantLocator("");
-            current.adapter->removeServantLocator("category");
+            ServantLocatorPtr locator = current.adapter->removeServantLocator("");
+            locator->deactivate("");
+            locator = current.adapter->removeServantLocator("category");
+            locator->deactivate("category");
         }
     }
 };