diff --git a/tests/cmdline/repl_autoindent.py b/tests/cmdline/repl_autoindent.py
new file mode 100644
index 0000000000..152c81895f
--- /dev/null
+++ b/tests/cmdline/repl_autoindent.py
@@ -0,0 +1,16 @@
+# tests for autoindent
+if 1:
+print(1)
+
+
+
+if 0:
+  print(2)
+else:
+  print(3)
+
+if 0:
+	print(4)
+else:
+	print(5)
+
diff --git a/tests/cmdline/repl_autoindent.py.exp b/tests/cmdline/repl_autoindent.py.exp
new file mode 100644
index 0000000000..9127a7d31d
--- /dev/null
+++ b/tests/cmdline/repl_autoindent.py.exp
@@ -0,0 +1,22 @@
+MicroPython \.\+ version
+Use \.\+
+>>> # tests for autoindent
+>>> if 1:
+...     print(1)
+...     
+...     
+... 
+1
+>>> if 0:
+...      print(2)
+... else:
+...   print(3)
+... 
+3
+>>> if 0:
+...     print(4)
+... else:
+...     print(5)
+... 
+5
+>>>