3 files changed, 26 insertions, 26 deletions
diff --git a/test/command/3706.md b/test/command/3706.md
index db50f8f68..b6c2c6db1 100644
--- a/test/command/3706.md
+++ b/test/command/3706.md
@@ -2,12 +2,12 @@ Results marker can be hidden in block attributes (#3706)
 
 ```
 pandoc -f org -t native
-#+BEGIN_SRC R :exports results :colnames yes
+#+begin_src r :exports results :colnames yes
    data.frame(Id = 1:3, Desc = rep("La",3))
-#+END_SRC
+#+end_src
 
-#+CAPTION: Lalelu.
-#+LABEL: tab
+#+caption: Lalelu.
+#+label: tab
 #+RESULTS:
 | Id | Desc |
 |----+------|
@@ -49,12 +49,12 @@ pandoc -f org -t native
 
 ```
 pandoc -f org -t native
-#+BEGIN_SRC R :exports none :colnames yes
+#+begin_src R :exports none :colnames yes
    data.frame(Id = 1:2, Desc = rep("La",2))
-#+END_SRC
+#+end_src
 
-#+CAPTION: Lalelu.
-#+LABEL: tab
+#+caption: Lalelu.
+#+label: tab
 #+RESULTS:
 | Id | Desc |
 |----+------|
diff --git a/test/command/4186.md b/test/command/4186.md
index 2345b0350..8c0d04a31 100644
--- a/test/command/4186.md
+++ b/test/command/4186.md
@@ -1,8 +1,8 @@
 ```
 % pandoc -f org -t native
-#+BEGIN_EXAMPLE -i
+#+begin_example -i
     This should retain the four leading spaces
-#+END_EXAMPLE
+#+end_example
 ^D
 [CodeBlock ("",["example"],[]) "    This should retain the four leading spaces\n"]
 ```
@@ -10,10 +10,10 @@
 ```
 % pandoc -f org -t html
 - depth 1
-  #+NAME: bob
-  #+BEGIN_EXAMPLE -i
+  #+name: bob
+  #+begin_example -i
     Vertical alignment is four spaces beyond the appearance of the word "depth".
-  #+END_EXAMPLE
+  #+end_example
        - depth 2
          #+begin_example
                           Vertically aligned with the second appearance of the word "depth".
@@ -27,10 +27,10 @@
     inner list element.
     #+end_example
          Still inside the inner list element
-   #+NAME: carrie
-                         #+BEGIN_EXAMPLE
+   #+name: carrie
+                         #+begin_example
                            This belongs to the outer list element, and is aligned accordingly, since the NAME attribute is not indented deeply enough. It is not enough for the BEGIN alone to be aligned deeply if the block is meant to have a NAME.
-                           #+END_EXAMPLE
+                           #+end_example
                  Still in the shallower list element since the preceding example
                  block forced the deeper list element to terminate.
 Outside all lists.
diff --git a/test/command/5178.md b/test/command/5178.md
index 57aace945..856f86abc 100644
--- a/test/command/5178.md
+++ b/test/command/5178.md
@@ -6,21 +6,21 @@
    main = putStrLn "Hello World!"
    unsafePerformIO main
 ^D
-#+BEGIN_SRC haskell -n 42
+#+begin_src haskell -n 42
   main = putStrLn "Hello World!"
   unsafePerformIO main
-#+END_SRC
+#+end_src
 ```
 
 ```
 % pandoc -f org -t native
-#+BEGIN_SRC lisp -n 20
+#+begin_src lisp -n 20
   (+ 1 1)
-#+END_SRC
+#+end_src
 
-#+BEGIN_SRC lisp +n 10
+#+begin_src lisp +n 10
   (+ 2 2)
-#+END_SRC
+#+end_src
 ^D
 [CodeBlock ("",["commonlisp","numberLines"],[("org-language","lisp"),("startFrom","20")]) "(+ 1 1)\n"
 ,CodeBlock ("",["commonlisp","numberLines","continuedSourceBlock"],[("org-language","lisp"),("startFrom","10")]) "(+ 2 2)\n"]
@@ -31,11 +31,11 @@
 [CodeBlock ("",["commonlisp","numberLines"],[("org-language","lisp"),("startFrom","20")]) "(+ 1 1)\n"
 ,CodeBlock ("",["commonlisp","numberLines","continuedSourceBlock"],[("org-language","lisp"),("startFrom","10")]) "(+ 2 2)\n"]
 ^D
-#+BEGIN_SRC lisp -n 20
+#+begin_src lisp -n 20
   (+ 1 1)
-#+END_SRC
+#+end_src
 
-#+BEGIN_SRC lisp +n 10
+#+begin_src lisp +n 10
   (+ 2 2)
-#+END_SRC
+#+end_src
 ```