diff --git a/autotests/testAdHoc/adhoc_test.py b/autotests/testAdHoc/adhoc_test.py
new file mode 100644
index 00000000..7e1d819a
--- /dev/null
+++ b/autotests/testAdHoc/adhoc_test.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+import time
+from time import sleep
+
+sys.path.append('../util')
+import iwd
+from iwd import IWD
+import testutil
+
+class Test(unittest.TestCase):
+
+    def test_connection_success(self):
+        wd = IWD(True)
+
+        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)
+        dev2.adhoc_wait_for_connected(dev1.address)
+
+        testutil.test_iface_operstate(dev1.name)
+        testutil.test_iface_operstate(dev2.name)
+        testutil.test_ifaces_connected(dev1.name, dev2.name)
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)
diff --git a/autotests/testAdHoc/failure_test.py b/autotests/testAdHoc/failure_test.py
new file mode 100644
index 00000000..ccb09025
--- /dev/null
+++ b/autotests/testAdHoc/failure_test.py
@@ -0,0 +1,44 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+import time
+from time import sleep
+
+sys.path.append('../util')
+import iwd
+from iwd import IWD
+import testutil
+
+class Test(unittest.TestCase):
+
+    def test_connection_success(self):
+        wd = IWD(True)
+
+        dev1, dev2 = wd.list_devices(2)
+
+        self.assertIsNotNone(dev1)
+        self.assertIsNotNone(dev2)
+
+        dev1.start_adhoc("AdHocNetwork", "secret123")
+        sleep(1)
+        dev2.start_adhoc("AdHocNetwork", "InvalidPassword")
+
+        wd.wait(15)
+       # dev1.adhoc_wait_for_connected(dev2.address)
+       # dev2.adhoc_wait_for_connected(dev1.address)
+
+       # testutil.test_iface_operstate(dev1.name)
+       # testutil.test_iface_operstate(dev2.name)
+       # testutil.test_ifaces_connected(dev1.name, dev2.name)
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)
diff --git a/autotests/testAdHoc/hw.conf b/autotests/testAdHoc/hw.conf
new file mode 100644
index 00000000..74cdd2d8
--- /dev/null
+++ b/autotests/testAdHoc/hw.conf
@@ -0,0 +1,4 @@
+[SETUP]
+num_radios=2
+max_test_exec_interval_sec=35
+start_iwd=0
diff --git a/autotests/testAdHoc/open_test.py b/autotests/testAdHoc/open_test.py
new file mode 100644
index 00000000..4042413f
--- /dev/null
+++ b/autotests/testAdHoc/open_test.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+import time
+from time import sleep
+
+sys.path.append('../util')
+import iwd
+from iwd import IWD
+import testutil
+
+class Test(unittest.TestCase):
+
+    def test_connection_success(self):
+        wd = IWD(True)
+
+        dev1, dev2 = wd.list_devices(2)
+
+        self.assertIsNotNone(dev1)
+        self.assertIsNotNone(dev2)
+
+        dev1.start_adhoc("AdHocNetwork")
+        sleep(1)
+        dev2.start_adhoc("AdHocNetwork")
+
+        dev1.adhoc_wait_for_connected(dev2.address)
+        dev2.adhoc_wait_for_connected(dev1.address)
+
+        #testutil.test_iface_operstate(dev1.name)
+        #testutil.test_iface_operstate(dev2.name)
+        #testutil.test_ifaces_connected(dev1.name, dev2.name)
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)