3 files changed, 7 insertions, 1 deletions
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index 2e98bcb7bed..0ab430667c5 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -869,6 +869,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             }
             catch(const Ice::DNSException&)
             {
+                serverCommunicator->destroy();
                 continue; // IP version not supported.
             }
             catch(const Ice::SocketException&)
@@ -877,6 +878,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
                 {
                     ipv6NotSupported = true;
                 }
+                serverCommunicator->destroy();
                 continue; // IP version not supported.
             }
 
@@ -912,7 +914,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
                          (*p == anyipv4 && *q == ipv6) || (*p == anyipv6 && *q == ipv4) ||
                          (*p == anyboth && *q == ipv4 && !dualStack) ||
                          (*p == localipv4 && *q == ipv6) || (*p == localipv6 && *q == ipv4));
-                    continue;
                 }
                 clientCommunicator->destroy();
             }
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp
index 926ea8f32ca..2788d7ca47f 100644
--- a/cpp/test/Ice/plugin/Client.cpp
+++ b/cpp/test/Ice/plugin/Client.cpp
@@ -175,6 +175,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.Plugin.PluginThreeFail", "plugins/TestPlugin:createPluginThreeFail");
         initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
         communicator = Ice::initialize(argc, argv, initData);
+        test(false);
     }
     catch(const std::exception& ex)
     {
diff --git a/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp
index 73d86e38930..6ea8d89303b 100644
--- a/cpp/test/Ice/plugin/Plugin.cpp
+++ b/cpp/test/Ice/plugin/Plugin.cpp
@@ -279,6 +279,8 @@ public:
         //
         test(!_three->isDestroyed());
         _destroyed = true;
+        _two = 0;
+        _three = 0;
     }
 
     ~PluginOneFail()
@@ -313,6 +315,8 @@ public:
     {
         _destroyed = true;
         test(!_one->isDestroyed());
+        _one = 0;
+        _three = 0;
     }
 
     ~PluginTwoFail()