diff --git a/autotests/testAdHoc/adhoc_test.py b/autotests/testAdHoc/adhoc_test.py
index 3cb3f418..856c4afb 100644
--- a/autotests/testAdHoc/adhoc_test.py
+++ b/autotests/testAdHoc/adhoc_test.py
@@ -12,16 +12,13 @@ import testutil
 
 class Test(unittest.TestCase):
 
-    def test_connection_success(self):
-        wd = IWD(True)
-
+    def validate_connection(self, wd):
         dev1, dev2 = wd.list_devices(2)
 
         self.assertIsNotNone(dev1)
         self.assertIsNotNone(dev2)
 
         dev1.start_adhoc("AdHocNetwork", "secret123")
-        sleep(1)
         dev2.start_adhoc("AdHocNetwork", "secret123")
 
         dev1.adhoc_wait_for_connected(dev2.address)
@@ -31,7 +28,13 @@ class Test(unittest.TestCase):
         testutil.test_iface_operstate(dev2.name)
         testutil.test_ifaces_connected(dev1.name, dev2.name)
 
-        del wd
+    def test_connection_success(self):
+        wd = IWD(True)
+
+        try:
+            self.validate_connection(wd)
+        finally:
+            del wd
 
     @classmethod
     def setUpClass(cls):
diff --git a/autotests/testAdHoc/failure_test.py b/autotests/testAdHoc/failure_test.py
index abc97907..f96f3a1f 100644
--- a/autotests/testAdHoc/failure_test.py
+++ b/autotests/testAdHoc/failure_test.py
@@ -12,9 +12,7 @@ import testutil
 
 class Test(unittest.TestCase):
 
-    def test_connection_success(self):
-        wd = IWD(True)
-
+    def validate_connection(self, wd):
         dev1, dev2 = wd.list_devices(2)
 
         self.assertIsNotNone(dev1)
@@ -23,6 +21,7 @@ class Test(unittest.TestCase):
         dev1.start_adhoc("AdHocNetwork", "secret123")
         sleep(1)
         dev2.start_adhoc("AdHocNetwork", "InvalidPassword")
+        #TODO: This test is unfinished.
 
        # dev1.adhoc_wait_for_connected(dev2.address)
        # dev2.adhoc_wait_for_connected(dev1.address)
@@ -31,7 +30,13 @@ class Test(unittest.TestCase):
        # testutil.test_iface_operstate(dev2.name)
        # testutil.test_ifaces_connected(dev1.name, dev2.name)
 
-        del wd
+    def test_connection_failure(self):
+        wd = IWD(True)
+
+        try:
+            self.validate_connection(wd)
+        finally:
+            del wd
 
     @classmethod
     def setUpClass(cls):
diff --git a/autotests/testAdHoc/open_test.py b/autotests/testAdHoc/open_test.py
index 2ee25c43..b6b10e24 100644
--- a/autotests/testAdHoc/open_test.py
+++ b/autotests/testAdHoc/open_test.py
@@ -12,9 +12,7 @@ import testutil
 
 class Test(unittest.TestCase):
 
-    def test_connection_success(self):
-        wd = IWD(True)
-
+    def validate_connection(self, wd):
         dev1, dev2 = wd.list_devices(2)
 
         self.assertIsNotNone(dev1)
@@ -31,7 +29,13 @@ class Test(unittest.TestCase):
         #testutil.test_iface_operstate(dev2.name)
         #testutil.test_ifaces_connected(dev1.name, dev2.name)
 
-        del wd
+    def test_connection_success(self):
+        wd = IWD(True)
+
+        try:
+            self.validate_connection(wd)
+        finally:
+            del wd
 
     @classmethod
     def setUpClass(cls):