diff --git a/autotests/testEAP-TTLS-CHAP/connection_test.py b/autotests/testEAP-TTLS-CHAP/connection_test.py
new file mode 100644
index 00000000..0e5c6281
--- /dev/null
+++ b/autotests/testEAP-TTLS-CHAP/connection_test.py
@@ -0,0 +1,84 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+
+sys.path.append('../util')
+import iwd
+import testutil
+from iwd import IWD
+from iwd import PSKAgent
+from iwd import NetworkType
+
+from hostapd import HostapdCLI
+from hostapd import hostapd_map
+
+class Test(unittest.TestCase):
+
+    def test_connection_success(self):
+        hostapd = None
+
+        for hostapd_if in list(hostapd_map.values()):
+            hpd = HostapdCLI(hostapd_if)
+            if hpd.get_config_value('ssid') == 'ssidEAP-TTLS-CHAP':
+                hostapd = hpd
+                break
+
+        self.assertIsNotNone(hostapd)
+
+        wd = IWD()
+
+        psk_agent = PSKAgent('abc', ('user', 'testpasswd'))
+        wd.register_psk_agent(psk_agent)
+
+        device = wd.list_devices(1)[0];
+
+        condition = 'not obj.scanning'
+        wd.wait_for_object_condition(device, condition)
+
+        device.scan()
+
+        condition = 'not obj.scanning'
+        wd.wait_for_object_condition(device, condition)
+
+        ordered_networks = device.get_ordered_networks()
+        ordered_network = ordered_networks[0]
+
+        self.assertEqual(ordered_network.name, "ssidEAP-TTLS-CHAP")
+        self.assertEqual(ordered_network.type, NetworkType.eap)
+
+        condition = 'not obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        ordered_network.network_object.connect()
+
+        condition = 'obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        hostapd.eapol_reauth(device.address)
+
+        wd.wait(10)
+
+        condition = 'obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        testutil.test_iface_operstate()
+        testutil.test_ifaces_connected()
+
+        device.disconnect()
+
+        condition = 'not obj.connected'
+        wd.wait_for_object_condition(ordered_network.network_object, condition)
+
+        wd.unregister_psk_agent(psk_agent)
+
+    @classmethod
+    def setUpClass(cls):
+        IWD.copy_to_storage('ssidEAP-TTLS-CHAP.8021x')
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)
diff --git a/autotests/testEAP-TTLS-CHAP/eap-user-ttls-chap.text b/autotests/testEAP-TTLS-CHAP/eap-user-ttls-chap.text
new file mode 100644
index 00000000..b10868ad
--- /dev/null
+++ b/autotests/testEAP-TTLS-CHAP/eap-user-ttls-chap.text
@@ -0,0 +1,4 @@
+# Phase 1 users
+* TTLS
+# Phase 2
+"user" TTLS-CHAP "testpasswd" [2]
diff --git a/autotests/testEAP-TTLS-CHAP/hw.conf b/autotests/testEAP-TTLS-CHAP/hw.conf
new file mode 100644
index 00000000..4cf51117
--- /dev/null
+++ b/autotests/testEAP-TTLS-CHAP/hw.conf
@@ -0,0 +1,6 @@
+[SETUP]
+num_radios=2
+tmpfs_extra_stuff=../misc/certs:eap-user-ttls-chap.text
+
+[HOSTAPD]
+rad0=ssidEAP-TTLS-CHAP.conf
diff --git a/autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.8021x b/autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.8021x
new file mode 100644
index 00000000..7570c2e2
--- /dev/null
+++ b/autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.8021x
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=anonymous
+EAP-TTLS-Phase2-Method=Tunneled-CHAP
+
+# If CHAP Identity and Password are left out, they will be requested through
+# the agent.
+#EAP-TTLS-Phase2-Identity=user
+#EAP-TTLS-Phase2-Password=testpasswd
+
+[Settings]
+Autoconnect=False
diff --git a/autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.conf b/autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.conf
new file mode 100644
index 00000000..babf6dbd
--- /dev/null
+++ b/autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.conf
@@ -0,0 +1,12 @@
+hw_mode=g
+channel=1
+ssid=ssidEAP-TTLS-CHAP
+
+wpa=3
+wpa_key_mgmt=WPA-EAP
+ieee8021x=1
+eap_server=1
+eap_user_file=/tmp/eap-user-ttls-chap.text
+ca_cert=/tmp/certs/cert-ca.pem
+server_cert=/tmp/certs/cert-server.pem
+private_key=/tmp/certs/cert-server-key.pem