2 files changed, 37 insertions, 0 deletions
diff --git a/test/Tests/Readers/Org.hs b/test/Tests/Readers/Org.hs
index 7a7960396..278d91cfd 100644
--- a/test/Tests/Readers/Org.hs
+++ b/test/Tests/Readers/Org.hs
@@ -469,6 +469,24 @@ tests =
                          , citationNoteNum = 0
                          , citationHash = 0}
           in (para . cite [citation] $ rawInline "latex" "\\cite{Coffee}")
+
+      , "Macro" =:
+          unlines [ "#+MACRO: HELLO /Hello, $1/"
+                  , "{{{HELLO(World)}}}"
+                  ] =?>
+          para (emph "Hello, World")
+
+      , "Macro repeting its argument" =:
+          unlines [ "#+MACRO: HELLO $1$1"
+                  , "{{{HELLO(moin)}}}"
+                  ] =?>
+          para "moinmoin"
+
+      , "Macro called with too few arguments" =:
+          unlines [ "#+MACRO: HELLO Foo $1 $2 Bar"
+                  , "{{{HELLO()}}}"
+                  ] =?>
+          para "Foo Bar"
       ]
 
   , testGroup "Meta Information" $
diff --git a/test/command/3401.md b/test/command/3401.md
new file mode 100644
index 000000000..99528553a
--- /dev/null
+++ b/test/command/3401.md
@@ -0,0 +1,19 @@
+See #3401 and <http://orgmode.org/manual/Macro-replacement.html>
+
+```
+% pandoc -f org -t native
+#+MACRO: HELLO /Hello, $1/
+{{{HELLO(World)}}}
+^D
+[Para [Emph [Str "Hello,",Space,Str "World"]]]
+```
+
+Inverted argument order
+
+```
+% pandoc -f org -t native
+#+MACRO: A $2,$1
+{{{A(1,2)}}}
+^D
+[Para [Str "2,1"]]
+```