diff --git a/test/prompt/history-abort-previous/cmd b/test/prompt/history-abort-previous/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/prompt/history-abort-previous/cmd
@@ -0,0 +1 @@
+
diff --git a/test/prompt/history-abort-previous/out b/test/prompt/history-abort-previous/out
new file mode 100644
index 000000000..845267745
--- /dev/null
+++ b/test/prompt/history-abort-previous/out
@@ -0,0 +1 @@
+bazbarfoob
diff --git a/test/prompt/history-abort-previous/rc b/test/prompt/history-abort-previous/rc
new file mode 100644
index 000000000..90e623cd1
--- /dev/null
+++ b/test/prompt/history-abort-previous/rc
@@ -0,0 +1 @@
+define-command append -params 1 %{ set-register dquote %arg{1}; execute-keys A<c-r>"<esc> }
diff --git a/test/prompt/history-abort-previous/script b/test/prompt/history-abort-previous/script
new file mode 100644
index 000000000..b9af7037a
--- /dev/null
+++ b/test/prompt/history-abort-previous/script
@@ -0,0 +1,2 @@
+ui_out -ignore 4
+ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ ":append baz<ret>:append bar<ret>:append foo<ret>:append b<c-p><c-n><ret>" ] }'
diff --git a/test/prompt/history-navigate/cmd b/test/prompt/history-navigate/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/prompt/history-navigate/cmd
@@ -0,0 +1 @@
+
diff --git a/test/prompt/history-navigate/out b/test/prompt/history-navigate/out
new file mode 100644
index 000000000..17a83b6d1
--- /dev/null
+++ b/test/prompt/history-navigate/out
@@ -0,0 +1 @@
+foobarbazbar
diff --git a/test/prompt/history-navigate/rc b/test/prompt/history-navigate/rc
new file mode 100644
index 000000000..90e623cd1
--- /dev/null
+++ b/test/prompt/history-navigate/rc
@@ -0,0 +1 @@
+define-command append -params 1 %{ set-register dquote %arg{1}; execute-keys A<c-r>"<esc> }
diff --git a/test/prompt/history-navigate/script b/test/prompt/history-navigate/script
new file mode 100644
index 000000000..eb8c8cf8a
--- /dev/null
+++ b/test/prompt/history-navigate/script
@@ -0,0 +1,2 @@
+ui_out -ignore 4
+ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ ":append foo<ret>:append bar<ret>:append baz<ret>:<c-p><c-p><c-p><c-n><c-n><c-p><ret>" ] }'
diff --git a/test/prompt/history-previous-prefix/cmd b/test/prompt/history-previous-prefix/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/prompt/history-previous-prefix/cmd
@@ -0,0 +1 @@
+
diff --git a/test/prompt/history-previous-prefix/out b/test/prompt/history-previous-prefix/out
new file mode 100644
index 000000000..72043b595
--- /dev/null
+++ b/test/prompt/history-previous-prefix/out
@@ -0,0 +1 @@
+bazbarfoobar
diff --git a/test/prompt/history-previous-prefix/rc b/test/prompt/history-previous-prefix/rc
new file mode 100644
index 000000000..90e623cd1
--- /dev/null
+++ b/test/prompt/history-previous-prefix/rc
@@ -0,0 +1 @@
+define-command append -params 1 %{ set-register dquote %arg{1}; execute-keys A<c-r>"<esc> }
diff --git a/test/prompt/history-previous-prefix/script b/test/prompt/history-previous-prefix/script
new file mode 100644
index 000000000..6e7d4b015
--- /dev/null
+++ b/test/prompt/history-previous-prefix/script
@@ -0,0 +1,2 @@
+ui_out -ignore 4
+ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ ":append baz<ret>:append bar<ret>:append foo<ret>:append b<c-p><ret>" ] }'
diff --git a/test/prompt/history-previous/cmd b/test/prompt/history-previous/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/prompt/history-previous/cmd
@@ -0,0 +1 @@
+
diff --git a/test/prompt/history-previous/out b/test/prompt/history-previous/out
new file mode 100644
index 000000000..17a83b6d1
--- /dev/null
+++ b/test/prompt/history-previous/out
@@ -0,0 +1 @@
+foobarbazbar
diff --git a/test/prompt/history-previous/rc b/test/prompt/history-previous/rc
new file mode 100644
index 000000000..90e623cd1
--- /dev/null
+++ b/test/prompt/history-previous/rc
@@ -0,0 +1 @@
+define-command append -params 1 %{ set-register dquote %arg{1}; execute-keys A<c-r>"<esc> }
diff --git a/test/prompt/history-previous/script b/test/prompt/history-previous/script
new file mode 100644
index 000000000..de55fc35c
--- /dev/null
+++ b/test/prompt/history-previous/script
@@ -0,0 +1,2 @@
+ui_out -ignore 4
+ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ ":append foo<ret>:append bar<ret>:append baz<ret>:<c-p><c-p><c-p><c-n><ret>" ] }'
diff --git a/test/prompt/history-repeat-last/cmd b/test/prompt/history-repeat-last/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/prompt/history-repeat-last/cmd
@@ -0,0 +1 @@
+
diff --git a/test/prompt/history-repeat-last/out b/test/prompt/history-repeat-last/out
new file mode 100644
index 000000000..55b5f1fcd
--- /dev/null
+++ b/test/prompt/history-repeat-last/out
@@ -0,0 +1 @@
+foofoo
diff --git a/test/prompt/history-repeat-last/rc b/test/prompt/history-repeat-last/rc
new file mode 100644
index 000000000..6000dff4e
--- /dev/null
+++ b/test/prompt/history-repeat-last/rc
@@ -0,0 +1 @@
+define-command test %{ execute-keys Afoo<esc> }
diff --git a/test/prompt/history-repeat-last/script b/test/prompt/history-repeat-last/script
new file mode 100644
index 000000000..7e7448327
--- /dev/null
+++ b/test/prompt/history-repeat-last/script
@@ -0,0 +1,2 @@
+ui_out -ignore 4
+ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ ":test<ret>:<ret>" ] }'
diff --git a/test/prompt/history-stop-at-first/cmd b/test/prompt/history-stop-at-first/cmd
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/test/prompt/history-stop-at-first/cmd
@@ -0,0 +1 @@
+
diff --git a/test/prompt/history-stop-at-first/out b/test/prompt/history-stop-at-first/out
new file mode 100644
index 000000000..7a594c45e
--- /dev/null
+++ b/test/prompt/history-stop-at-first/out
@@ -0,0 +1 @@
+foobarfoo
diff --git a/test/prompt/history-stop-at-first/rc b/test/prompt/history-stop-at-first/rc
new file mode 100644
index 000000000..90e623cd1
--- /dev/null
+++ b/test/prompt/history-stop-at-first/rc
@@ -0,0 +1 @@
+define-command append -params 1 %{ set-register dquote %arg{1}; execute-keys A<c-r>"<esc> }
diff --git a/test/prompt/history-stop-at-first/script b/test/prompt/history-stop-at-first/script
new file mode 100644
index 000000000..296ca6401
--- /dev/null
+++ b/test/prompt/history-stop-at-first/script
@@ -0,0 +1,2 @@
+ui_out -ignore 4
+ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ ":append foo<ret>:append bar<ret>:<c-p><c-p><c-p><ret>" ] }'