diff --git a/test/corpus/environments.txt b/test/corpus/environments.txt
index 52573b76e..160cbdc95 100644
--- a/test/corpus/environments.txt
+++ b/test/corpus/environments.txt
@@ -231,13 +231,13 @@ Math environment
         (text
           (word))))
     (text
-      (word))
-    (curly_group
-      (text
+     (word)
+     (superscript
+      (curly_group
+       (text
         (word)
         (generic_command
-          (command_name))))
-    (text
+         (command_name)))))
       (operator)
       (word))
     (text
diff --git a/test/corpus/issues.txt b/test/corpus/issues.txt
index 6c45e9e12..9243a574a 100644
--- a/test/corpus/issues.txt
+++ b/test/corpus/issues.txt
@@ -480,8 +480,12 @@ Let
       (word))
     (text
       (word)
+      (superscript
+        (word))
       (operator)
-      (word))
+      (word)
+      (superscript
+        (word)))
     (text_mode
       (curly_group
         (text
@@ -492,8 +496,12 @@ Let
       (word))
     (text
       (word)
+      (superscript
+        (word))
       (operator)
-      (word))
+      (word)
+      (superscript
+        (word)))
     (end
       (curly_group_text
         (text
diff --git a/test/corpus/math.txt b/test/corpus/math.txt
index 3b49e2c97..4050dcdc6 100644
--- a/test/corpus/math.txt
+++ b/test/corpus/math.txt
@@ -205,3 +205,21 @@ Simple math set
     (word)
     (generic_command
       (command_name))))
+
+================================================================================
+Subscripts and superscripts
+================================================================================
+
+Foo_{bar}^2
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (text
+    (word)
+    (subscript
+      (curly_group
+        (text
+        (word))))
+    (superscript
+      (word))))