1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/test/Common/TestHelper.cpp b/cpp/test/Common/TestHelper.cpp
index 7132212afec..55849584e00 100644
--- a/cpp/test/Common/TestHelper.cpp
+++ b/cpp/test/Common/TestHelper.cpp
@@ -208,6 +208,10 @@ Ice::CommunicatorPtr
 Test::TestHelper::initialize(int& argc, char* argv[], const Ice::InitializationData& initData)
 {
     _communicator = Ice::initialize(argc, argv, initData);
+    if(_controllerHelper)
+    {
+        _controllerHelper->communicatorInitialized(_communicator);
+    }
     return _communicator;
 }
 
@@ -220,10 +224,10 @@ Test::TestHelper::communicator() const
 void
 Test::TestHelper::serverReady()
 {
-#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
-    assert(_controllerHelper);
-    _controllerHelper->serverReady();
-#endif
+    if(_controllerHelper)
+    {
+        _controllerHelper->serverReady();
+    }
 }
 
 void