diff --git a/tests/extmod/ucryptolib_aes128_cbc.py b/tests/extmod/ucryptolib_aes128_cbc.py
new file mode 100644
index 0000000000..4c5ea6acb2
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes128_cbc.py
@@ -0,0 +1,15 @@
+try:
+    from Crypto.Cipher import AES
+    aes = AES.new
+except ImportError:
+    try:
+        from ucryptolib import aes
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+crypto = aes(b"1234" * 4, 2, b"5678" * 4)
+enc = crypto.encrypt(bytes(range(32)))
+print(enc)
+crypto = aes(b"1234" * 4, 2, b"5678" * 4)
+print(crypto.decrypt(enc))
diff --git a/tests/extmod/ucryptolib_aes128_cbc.py.exp b/tests/extmod/ucryptolib_aes128_cbc.py.exp
new file mode 100644
index 0000000000..cc73553b2a
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes128_cbc.py.exp
@@ -0,0 +1,2 @@
+b'\x1d\x84\xfa\xaa%\x0e9\x143\x8b6\xf8\xdf^yh\xd0\x94g\xf4\xcf\x1d\xa0I)\x8a\xa0\x00u0+C'
+b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'
diff --git a/tests/extmod/ucryptolib_aes128_ecb.py b/tests/extmod/ucryptolib_aes128_ecb.py
new file mode 100644
index 0000000000..89451b282c
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes128_ecb.py
@@ -0,0 +1,15 @@
+try:
+    from Crypto.Cipher import AES
+    aes = AES.new
+except ImportError:
+    try:
+        from ucryptolib import aes
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+crypto = aes(b"1234" * 4, 1)
+enc = crypto.encrypt(bytes(range(32)))
+print(enc)
+crypto = aes(b"1234" * 4, 1)
+print(crypto.decrypt(enc))
diff --git a/tests/extmod/ucryptolib_aes128_ecb.py.exp b/tests/extmod/ucryptolib_aes128_ecb.py.exp
new file mode 100644
index 0000000000..b0fd15b447
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes128_ecb.py.exp
@@ -0,0 +1,2 @@
+b'Iz\xfe9\x17\xac\xa4X\x12\x04\x10\xf5K~#\xc7\xac;\xf9\xc6E\xa8\xca~\xf1\xee\xd3f%\xf1\x8d\xfe'
+b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'
diff --git a/tests/extmod/ucryptolib_aes128_ecb_enc.py b/tests/extmod/ucryptolib_aes128_ecb_enc.py
new file mode 100644
index 0000000000..55b676d361
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes128_ecb_enc.py
@@ -0,0 +1,16 @@
+# This tests minimal configuration of ucrypto module, which is
+# AES128 encryption (anything else, including AES128 decryption,
+# is optional).
+try:
+    from Crypto.Cipher import AES
+    aes = AES.new
+except ImportError:
+    try:
+        from ucryptolib import aes
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+crypto = aes(b"1234" * 4, 1)
+enc = crypto.encrypt(bytes(range(32)))
+print(enc)
diff --git a/tests/extmod/ucryptolib_aes128_ecb_enc.py.exp b/tests/extmod/ucryptolib_aes128_ecb_enc.py.exp
new file mode 100644
index 0000000000..9921d4b83a
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes128_ecb_enc.py.exp
@@ -0,0 +1 @@
+b'Iz\xfe9\x17\xac\xa4X\x12\x04\x10\xf5K~#\xc7\xac;\xf9\xc6E\xa8\xca~\xf1\xee\xd3f%\xf1\x8d\xfe'
diff --git a/tests/extmod/ucryptolib_aes256_cbc.py b/tests/extmod/ucryptolib_aes256_cbc.py
new file mode 100644
index 0000000000..a907f26e26
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes256_cbc.py
@@ -0,0 +1,15 @@
+try:
+    from Crypto.Cipher import AES
+    aes = AES.new
+except ImportError:
+    try:
+        from ucryptolib import aes
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+crypto = aes(b"1234" * 8, 2, b"5678" * 4)
+enc = crypto.encrypt(bytes(range(32)))
+print(enc)
+crypto = aes(b"1234" * 8, 2, b"5678" * 4)
+print(crypto.decrypt(enc))
diff --git a/tests/extmod/ucryptolib_aes256_cbc.py.exp b/tests/extmod/ucryptolib_aes256_cbc.py.exp
new file mode 100644
index 0000000000..51262db9c6
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes256_cbc.py.exp
@@ -0,0 +1,2 @@
+b'\xb4\x0b\xff\xdd\xfc\xb5\x03\x88[m\xc1\x01+:\x03M\x18\xb03\x0f\x971g\x10\xb1\x98>\x9b\x17\xb7-\xb2'
+b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'
diff --git a/tests/extmod/ucryptolib_aes256_ecb.py b/tests/extmod/ucryptolib_aes256_ecb.py
new file mode 100644
index 0000000000..326383a454
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes256_ecb.py
@@ -0,0 +1,15 @@
+try:
+    from Crypto.Cipher import AES
+    aes = AES.new
+except ImportError:
+    try:
+        from ucryptolib import aes
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+crypto = aes(b"1234" * 8, 1)
+enc = crypto.encrypt(bytes(range(32)))
+print(enc)
+crypto = aes(b"1234" * 8, 1)
+print(crypto.decrypt(enc))
diff --git a/tests/extmod/ucryptolib_aes256_ecb.py.exp b/tests/extmod/ucryptolib_aes256_ecb.py.exp
new file mode 100644
index 0000000000..a00a4eb2f5
--- /dev/null
+++ b/tests/extmod/ucryptolib_aes256_ecb.py.exp
@@ -0,0 +1,2 @@
+b'\xe2\xe0\xdd\xef\xc3\xcd\x88/!>\xf6\xa2\xef/\xd15z+`\xb2\xb2\xd7}!:V>\xeb\x19\xbf|\xea'
+b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'