2 files changed, 3 insertions, 4 deletions
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index f1abdd0ef00..aae50c90f99 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -102,8 +102,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
 	return EXIT_FAILURE;
     }
 
-    properties->setProperty("SubscriberAdapter.Endpoints", "default");
-    ObjectAdapterPtr adapter = communicator->createObjectAdapter("SubscriberAdapter");
+    ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SubscriberAdapter", "default");
     EventIPtr eventFed1 = new EventI(communicator);
     EventIPtr eventFed2 = new EventI(communicator);
     EventIPtr eventFed3 = new EventI(communicator);
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index 23f3ca1db29..58a45de9c5f 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -77,6 +77,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
     {
 	lockfile = argv[1];
     }
+
     createLock(lockfile);
 
     const char* managerProxyProperty = "IceStorm.TopicManager.Proxy";
@@ -95,8 +96,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
 	return EXIT_FAILURE;
     }
 
-    properties->setProperty("SingleAdapter", "default");
-    ObjectAdapterPtr adapter = communicator->createObjectAdapter("SingleAdapter");
+    ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SingleAdapter", "default");
     ObjectPtr single = new SingleI(communicator);
     ObjectPrx object = adapter->add(single, stringToIdentity("single/events"));