diff --git a/src/Text/Pandoc/Writers/Haddock.hs b/src/Text/Pandoc/Writers/Haddock.hs
index 36f57c2b7..1939d3a6d 100644
--- a/src/Text/Pandoc/Writers/Haddock.hs
+++ b/src/Text/Pandoc/Writers/Haddock.hs
@@ -129,7 +129,7 @@ blockToHaddock opts (BlockQuote blocks) =
 -- Haddock doesn't have tables.  Use haddock tables in code.
 blockToHaddock opts (Table caption aligns widths headers rows) = do
   caption' <- inlineListToHaddock opts caption
-  let caption'' = if null caption || not (isEnabled Ext_table_captions opts)
+  let caption'' = if null caption
                      then empty
                      else blankline <> caption' <> blankline
   rawHeaders <- mapM (blockListToHaddock opts) headers
@@ -148,7 +148,7 @@ blockToHaddock opts (Table caption aligns widths headers rows) = do
                   | otherwise -> fmap (id,) $
                          gridTable opts (all null headers) aligns widths
                              rawHeaders rawRows
-  return $ prefixed "> " $ nst $ tbl $$ blankline $$ caption'' $$ blankline
+  return $ (prefixed "> " $ nst $ tbl $$ blankline $$ caption'') $$ blankline
 blockToHaddock opts (BulletList items) = do
   contents <- mapM (bulletListItemToHaddock opts) items
   return $ cat contents <> blankline
diff --git a/tests/tables.haddock b/tests/tables.haddock
index e054dc072..413ec97ad 100644
--- a/tests/tables.haddock
+++ b/tests/tables.haddock
@@ -6,6 +6,8 @@ Simple table with caption:
 >       123 123      123    123
 >         1 1         1     1
 >
+>   Demonstration of simple table syntax.
+
 Simple table without caption:
 
 >     Right Left    Center  Default
@@ -13,7 +15,7 @@ Simple table without caption:
 >        12 12        12    12
 >       123 123      123    123
 >         1 1         1     1
->
+
 Simple table indented two spaces:
 
 >     Right Left    Center  Default
@@ -22,6 +24,8 @@ Simple table indented two spaces:
 >       123 123      123    123
 >         1 1         1     1
 >
+>   Demonstration of simple table syntax.
+
 Multiline table with caption:
 
 >   --------------------------------------------------------------
@@ -36,6 +40,8 @@ Multiline table with caption:
 >                                       rows.
 >   --------------------------------------------------------------
 >
+>   Here\'s the caption. It may span multiple lines.
+
 Multiline table without caption:
 
 >   --------------------------------------------------------------
@@ -49,7 +55,7 @@ Multiline table without caption:
 >                                       the blank line between
 >                                       rows.
 >   --------------------------------------------------------------
->
+
 Table without column headers:
 
 >   ----- ----- ----- -----
@@ -57,7 +63,7 @@ Table without column headers:
 >     123 123    123    123
 >       1 1       1       1
 >   ----- ----- ----- -----
->
+
 Multiline table without column headers:
 
 >   ----------- ---------- ------------ --------------------------
@@ -68,5 +74,4 @@ Multiline table without column headers:
 >                                       the blank line between
 >                                       rows.
 >   ----------- ---------- ------------ --------------------------
->