diff --git a/tests/languages/elixir/attribute_feature.test b/tests/languages/elixir/attribute_feature.test
index 273c2a402f..393302578a 100644
--- a/tests/languages/elixir/attribute_feature.test
+++ b/tests/languages/elixir/attribute_feature.test
@@ -8,12 +8,10 @@ foobar
 
 [
 	["attribute", "@vsn"], ["number", "2"],
-	["attribute", "@moduledoc"], ["string", [
-		"\"\"\"\r\nfoobar\r\n\"\"\""
-	]],
+	["doc", "@moduledoc \"\"\"\r\nfoobar\r\n\"\"\""],
 	["attribute", "@tag"], ["atom", ":external"]
 ]
 
 ----------------------------------------------------
 
-Checks for module attributes.
\ No newline at end of file
+Checks for module attributes.
diff --git a/tests/languages/elixir/capture_feature.test b/tests/languages/elixir/capture_feature.test
index 8a64b66154..33ca246db7 100644
--- a/tests/languages/elixir/capture_feature.test
+++ b/tests/languages/elixir/capture_feature.test
@@ -7,7 +7,10 @@ fun = &(&1 + 1)
 
 [
 	"fun ", ["operator", "="],
-	["capture", "&Math.zero?/1"],
+	["operator", "&"],
+	["atom-module", "Math"],
+	["punctuation", "."],
+	["function-call", "zero?/1"],
 	["punctuation", "("],
 	["capture", "&is_function/1"],
 	["punctuation", ")"],
@@ -17,7 +20,9 @@ fun = &(&1 + 1)
 	["capture", "&"],
 	["punctuation", "("], ["argument", "&1"],
 	["operator", "+"], ["number", "1"], ["punctuation", ")"],
-	["capture", "&List.flatten"],
+	["operator", "&"],
+	["atom-module", "List"],
+	["punctuation", "."], ["function-call", "flatten"],
 	["punctuation", "("], ["argument", "&1"],
 	["punctuation", ","], ["argument", "&2"],
 	["punctuation", ")"]
@@ -25,4 +30,4 @@ fun = &(&1 + 1)
 
 ----------------------------------------------------
 
-Checks for function capturing and arguments.
\ No newline at end of file
+Checks for function capturing and arguments.
diff --git a/tests/languages/elixir/issue1392.test b/tests/languages/elixir/issue1392.test
index c7d20a8366..61ae98a27d 100644
--- a/tests/languages/elixir/issue1392.test
+++ b/tests/languages/elixir/issue1392.test
@@ -3,9 +3,9 @@ String.upcase(@fixed)
 ----------------------------------------------------
 
 [
-	"String",
+	["atom-module", "String"],
 	["punctuation", "."],
-	"upcase",
+	["function-call", "upcase"],
 	["punctuation", "("],
 	["attribute", "@fixed"],
 	["punctuation", ")"]
@@ -13,4 +13,4 @@ String.upcase(@fixed)
 
 ----------------------------------------------------
 
-Ensure module attributes don't consume punctuation.
\ No newline at end of file
+Ensure module attributes don't consume punctuation.
diff --git a/tests/languages/elixir/issue775.test b/tests/languages/elixir/issue775.test
index d3243f80a8..65d822ebfc 100644
--- a/tests/languages/elixir/issue775.test
+++ b/tests/languages/elixir/issue775.test
@@ -5,13 +5,10 @@
 ----------------------------------------------------
 
 [
-	["attribute", "@doc"],
-	["string", [
-		"\"\"\"\r\n## Parameters\r\n\"\"\""
-	]]
+	["doc", "@doc \"\"\"\r\n## Parameters\r\n\"\"\""]
 ]
 
 ----------------------------------------------------
 
 Ensures that markdown headers are not highlighted as comments inside strings.
-See #775 for details.
\ No newline at end of file
+See #775 for details.
diff --git a/tests/languages/elixir/keyword_feature.test b/tests/languages/elixir/keyword_feature.test
index 6a851f1b24..c4f56fed67 100644
--- a/tests/languages/elixir/keyword_feature.test
+++ b/tests/languages/elixir/keyword_feature.test
@@ -9,7 +9,7 @@ defdelegate
 defstruct do else
 end fn for if
 import not or
-require rescue try
+raise require rescue try
 unless use when
 
 ----------------------------------------------------
@@ -26,7 +26,7 @@ unless use when
 	["keyword", "defstruct"], ["keyword", "do"], ["keyword", "else"],
 	["keyword", "end"], ["keyword", "fn"], ["keyword", "for"], ["keyword", "if"],
 	["keyword", "import"], ["keyword", "not"], ["keyword", "or"],
-	["keyword", "require"], ["keyword", "rescue"], ["keyword", "try"],
+	["keyword", "raise"], ["keyword", "require"], ["keyword", "rescue"], ["keyword", "try"],
 	["keyword", "unless"], ["keyword", "use"], ["keyword", "when"]
 ]
 
diff --git a/tests/languages/elixir/module_feature.test b/tests/languages/elixir/module_feature.test
index c0236d0bb7..effa744a3b 100644
--- a/tests/languages/elixir/module_feature.test
+++ b/tests/languages/elixir/module_feature.test
@@ -7,10 +7,10 @@ end
 ----------------------------------------------------
 
 [
-	["keyword", "defmodule"], ["module", "Math"], ["keyword", "do"],
+	["keyword", "defmodule"], ["atom-module", "Math"], ["keyword", "do"],
 
     ["keyword", "def"],
-    ["function", "sum"],
+    ["function-call", "sum"],
     ["punctuation", "("],
     "a",
     ["punctuation", ","],