diff --git a/tests/languages/java/keyword_feature.test b/tests/languages/java/keyword_feature.test
new file mode 100644
index 0000000000..4a6613c868
--- /dev/null
+++ b/tests/languages/java/keyword_feature.test
@@ -0,0 +1,51 @@
+abstract continue for
+new ;
+switch assert default
+goto package synchronized
+boolean do if private
+this break double
+implements ;
+protected throw byte else
+import public throws case
+enum
+instanceof ;
+return transient catch
+extends ;
+int short try char
+final
+interface ;
+static void
+class ;
+finally long
+strictfp volatile const
+float native super while
+
+----------------------------------------------------
+
+[
+	["keyword", "abstract"], ["keyword", "continue"], ["keyword", "for"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "switch"], ["keyword", "assert"], ["keyword", "default"],
+	["keyword", "goto"], ["keyword", "package"], ["keyword", "synchronized"],
+	["keyword", "boolean"], ["keyword", "do"], ["keyword", "if"], ["keyword", "private"],
+	["keyword", "this"], ["keyword", "break"], ["keyword", "double"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "protected"], ["keyword", "throw"], ["keyword", "byte"], ["keyword", "else"],
+	["keyword", "import"], ["keyword", "public"], ["keyword", "throws"], ["keyword", "case"],
+	["keyword", "enum"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "return"], ["keyword", "transient"], ["keyword", "catch"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "int"], ["keyword", "short"], ["keyword", "try"], ["keyword", "char"],
+	["keyword", "final"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "static"],	["keyword", "void"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "finally"], ["keyword", "long"],
+	["keyword", "strictfp"], ["keyword", "volatile"], ["keyword", "const"],
+	["keyword", "float"], ["keyword", "native"], ["keyword", "super"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/java/number_feature.test b/tests/languages/java/number_feature.test
new file mode 100644
index 0000000000..b88f082c19
--- /dev/null
+++ b/tests/languages/java/number_feature.test
@@ -0,0 +1,27 @@
+0b11110000
+0xBadFace
+0x1.8p1
+0xa.fp-2
+42
+42d
+1.2e3f
+0.1E-4f
+0.2e+1f
+
+----------------------------------------------------
+
+[
+	["number", "0b11110000"],
+	["number", "0xBadFace"],
+	["number", "0x1.8p1"],
+	["number", "0xa.fp-2"],
+	["number", "42"],
+	["number", "42d"],
+	["number", "1.2e3f"],
+	["number", "0.1E-4f"],
+	["number", "0.2e+1f"]
+]
+
+----------------------------------------------------
+
+Checks for binary, hexadecimal and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/java/operator_feature.test b/tests/languages/java/operator_feature.test
new file mode 100644
index 0000000000..87f4906b6d
--- /dev/null
+++ b/tests/languages/java/operator_feature.test
@@ -0,0 +1,33 @@
++ ++ +=
+- -- -=
+! !=
+< << <= <<=
+> >> >>> >= >>= >>>=
+= ==
+& && &=
+| || |=
+? : ~
+* *=
+/ /=
+% %=
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "++"], ["operator", "+="],
+	["operator", "-"], ["operator", "--"], ["operator", "-="],
+	["operator", "!"], ["operator", "!="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", "<<="],
+	["operator", ">"], ["operator", ">>"], ["operator", ">>>"], ["operator", ">="], ["operator", ">>="], ["operator", ">>>="],
+	["operator", "="], ["operator", "=="],
+	["operator", "&"], ["operator", "&&"], ["operator", "&="],
+	["operator", "|"], ["operator", "||"], ["operator", "|="],
+	["operator", "?"], ["operator", ":"], ["operator", "~"],
+	["operator", "*"], ["operator", "*="],
+	["operator", "/"], ["operator", "/="],
+	["operator", "%"], ["operator", "%="]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file