diff --git a/test/display/horizontal-scroll-onto-tab/cmd b/test/display/horizontal-scroll-onto-tab/cmd
new file mode 100644
index 00000000..7b406b16
--- /dev/null
+++ b/test/display/horizontal-scroll-onto-tab/cmd
@@ -0,0 +1 @@
+j2f<tab>;
diff --git a/test/display/horizontal-scroll-onto-tab/display b/test/display/horizontal-scroll-onto-tab/display
new file mode 100644
index 00000000..3505ae3b
--- /dev/null
+++ b/test/display/horizontal-scroll-onto-tab/display
@@ -0,0 +1,6 @@
+{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "23456789012345678901234567890123456789012345678901234567890123456789012345678901" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "234567890123456789012345678901234567890123456789012345678901234567890123456" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "    " }, { "face": { "fg": "black", "bg": "white", "attributes": [] }, "contents": " " }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "       " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "90" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "      " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "7890\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }
+{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }
+{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }
+{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 2:78 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - unnamed0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }
+{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 1, "column": 79 }] }
+{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }
diff --git a/test/display/horizontal-scroll-onto-tab/in b/test/display/horizontal-scroll-onto-tab/in
new file mode 100644
index 00000000..efbc5615
--- /dev/null
+++ b/test/display/horizontal-scroll-onto-tab/in
@@ -0,0 +1,3 @@
+123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+1234567890123456789012345678901234567890123456789012345678901234567890123456		90
+	90	7890
diff --git a/test/display/horizontal-scroll-with-tab/cmd b/test/display/horizontal-scroll-with-tab/cmd
new file mode 100644
index 00000000..f13d7ddb
--- /dev/null
+++ b/test/display/horizontal-scroll-with-tab/cmd
@@ -0,0 +1 @@
+gl
diff --git a/test/display/horizontal-scroll-with-tab/display b/test/display/horizontal-scroll-with-tab/display
new file mode 100644
index 00000000..cd015cab
--- /dev/null
+++ b/test/display/horizontal-scroll-with-tab/display
@@ -0,0 +1,6 @@
+{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "1234567890123456789012345678901234567890123456789012345678901234567890123456789" }, { "face": { "fg": "black", "bg": "white", "attributes": [] }, "contents": "0" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "      " }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "7890\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }
+{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }
+{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }
+{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:90 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - unnamed0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }
+{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 79 }] }
+{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }
diff --git a/test/display/horizontal-scroll-with-tab/in b/test/display/horizontal-scroll-with-tab/in
new file mode 100644
index 00000000..8bf39382
--- /dev/null
+++ b/test/display/horizontal-scroll-with-tab/in
@@ -0,0 +1,2 @@
+123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+	90	7890