diff --git a/integtest/Makefile b/integtest/Makefile
index 38649e798d881..86a66972a9fc4 100644
--- a/integtest/Makefile
+++ b/integtest/Makefile
@@ -17,6 +17,7 @@ check: \
 	beta_expected_files beta_same_files \
 	experimental_expected_files experimental_same_files \
 	missing_include_fails_asciidoc missing_include_fails_asciidoctor \
+	adoc_expected_files adoc_same_files \
 	migration_warnings \
 	readme_expected_files readme_same_files \
 	simple_all \
@@ -117,6 +118,12 @@ migration_warnings: migration_warnings.asciidoc
 /tmp/readme_asciidoctor: /docs_build/README.asciidoc
 	$(BD) --asciidoctor --doc /docs_build/README.asciidoc
 
+/tmp/adoc_asciidoc: minimal.adoc
+	$(BD) --doc $^
+
+/tmp/adoc_asciidoctor: minimal.adoc
+	$(BD) --asciidoctor --doc $^
+
 # These don't declare dependencies because we don't know in general which files
 # are needed to build which asciidoc files.
 .PRECIOUS: /tmp/%_asciidoc     # don't try to remove the directory. you can't
diff --git a/integtest/minimal.adoc b/integtest/minimal.adoc
new file mode 100644
index 0000000000000..0784b3c95862b
--- /dev/null
+++ b/integtest/minimal.adoc
@@ -0,0 +1,7 @@
+= Title
+
+== Chapter
+
+This is a minimal viable asciidoc file for use with build_docs. The actual
+contents of this paragraph aren't important but having a paragraph here
+is required.
diff --git a/lib/ES/Util.pm b/lib/ES/Util.pm
index 6ac83f76a9340..46a25c29b3293 100644
--- a/lib/ES/Util.pm
+++ b/lib/ES/Util.pm
@@ -68,7 +68,7 @@ sub build_chunked {
     my ( $output, $died );
     if ( $asciidoctor ) {
         my $dest_xml = $index->basename;
-        $dest_xml =~ s/\.asciidoc$/\.xml/;
+        $dest_xml =~ s/\.a(scii)?doc$/\.xml/;
         $dest_xml = $dest->file($dest_xml);
 
         %xsltopts = (%xsltopts,
@@ -201,7 +201,7 @@ sub build_single {
     my ( $output, $died );
     if ( $asciidoctor ) {
         my $dest_xml = $index->basename;
-        $dest_xml =~ s/\.asciidoc$/\.xml/;
+        $dest_xml =~ s/\.a(scii)?doc$/\.xml/;
         $dest_xml = $dest->file($dest_xml);
 
         %xsltopts = (%xsltopts,