diff --git a/consumers.md b/consumers.md
index 3b5a571..7536a36 100644
--- a/consumers.md
+++ b/consumers.md
@@ -13,6 +13,7 @@ grouped by programming language.
 
 Languages:
 [C](#c),
+[Elvish](#elvish),
 [Go](#go),
 [Java](#java),
 [JavaScript](#javascript),
@@ -50,6 +51,11 @@ written with YACC and Lex.
 **[tapto](https://github.com/katef/tapto)** is a TAP parser that formats
 results to XML and other formats.
 
+## <a id="elvish"></a> [Elvish](#elvish)
+
+**[elvish-tap](https://github.com/tesujimath/elvish-tap)** is a TAP producer
+and basic consumer for Elvish.
+
 ## <a id="go"></a> [Go](#go)
 
 - [tap13](https://github.com/mpontillo/tap13/) is a TAP parser that translates
diff --git a/producers.md b/producers.md
index 3e86ee1..f6fc6db 100644
--- a/producers.md
+++ b/producers.md
@@ -18,6 +18,7 @@ Languages:
 [Common Lisp](#common-lisp),
 [Crystal](#crystal),
 [Elixir](#elixir),
+[Elvish](#elvish),
 [Erlang](#erlang),
 [Fish](#fish),
 [Forth](#forth),
@@ -183,6 +184,21 @@ generates TAP output for existing ExUnit test suites. Spout provides
 a simple way to generate TAP output without having to modify existing
 test code. Based on CTTAP.
 
+## <a id="elvish"></a> [Elvish](#elvish)
+
+> Elvish (noun):
+>
+> A powerful scripting language.
+>
+> A shell with useful interactive features built-in.
+>
+> A statically linked binary for Linux, BSDs, macOS or Windows.
+>
+> *From [elv.sh](https://elv.sh/)*
+
+**[elvish-tap](https://github.com/tesujimath/elvish-tap)** is a TAP producer
+and basic consumer for Elvish.
+
 ## <a id="erlang"></a> [Erlang](#erlang)
 
 > Erlang is a programming language used to build massively scalable soft