1 files changed, 2 insertions, 5 deletions
diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index 999a41115c8..04e28fdf8d0 100755
--- a/python/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
@@ -175,13 +175,10 @@ try:
     initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
     initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
     initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
-    communicator = Ice.initialize(sys.argv, initData)
-    status = run(sys.argv, communicator)
+    with Ice.initialize(sys.argv, initData) as communicator:
+        status = run(sys.argv, communicator)
 except:
     traceback.print_exc()
     status = False
 
-if communicator:
-    communicator.destroy()
-
 sys.exit(not status)